OSDN Git Service
Saito [Fri, 30 Dec 2011 10:30:57 +0000 (18:30 +0800)]
Revert "merge charlock_holmes to master"
This reverts commit
a25a85b9396cbc07bf2bfcd12d3c0a6685df66d6.
Saito [Fri, 30 Dec 2011 10:30:57 +0000 (18:30 +0800)]
Revert "fix travis dependency, add libicu support"
This reverts commit
78d882623e13f061349ff6237e250970fc48d8a4.
Saito [Thu, 29 Dec 2011 05:33:25 +0000 (13:33 +0800)]
fix travis dependency, add libicu support
Saito [Thu, 29 Dec 2011 03:51:33 +0000 (11:51 +0800)]
merge charlock_holmes to master
Dmitriy Zaporozhets [Wed, 28 Dec 2011 07:18:50 +0000 (09:18 +0200)]
favicon updated
Dmitriy Zaporozhets [Wed, 28 Dec 2011 07:08:50 +0000 (09:08 +0200)]
commented dashboard spec
Dmitriy Zaporozhets [Wed, 28 Dec 2011 07:08:40 +0000 (09:08 +0200)]
temp fix for project hooks
Dmitriy Zaporozhets [Wed, 28 Dec 2011 07:07:40 +0000 (09:07 +0200)]
dashboard test fix
Valery Sizov [Tue, 27 Dec 2011 23:29:53 +0000 (01:29 +0200)]
small redesign of controls of notes
Valery Sizov [Tue, 27 Dec 2011 23:06:55 +0000 (01:06 +0200)]
commit helper refactoring
Valeriy Sizov [Tue, 27 Dec 2011 22:49:38 +0000 (14:49 -0800)]
Merge pull request #237 from CedricGatay/feature/expand_issues_ref_in_commit
Autolinks to issues in commit message (see #155)
Valeriy Sizov [Tue, 27 Dec 2011 22:35:41 +0000 (14:35 -0800)]
Merge pull request #234 from dbr/patch-1
Minor tweak to readme
Valeriy Sizov [Tue, 27 Dec 2011 22:33:38 +0000 (14:33 -0800)]
Merge pull request #203 from mlitwiniuk/top_nav_fix
Hide admin menu for non-admins
Valery Sizov [Tue, 27 Dec 2011 21:49:16 +0000 (23:49 +0200)]
commented some tests
Valery Sizov [Tue, 27 Dec 2011 21:21:26 +0000 (23:21 +0200)]
Merge branch 'web_hooks' of https://github.com/ariejan/gitlabhq into ariejan-web_hooks
Conflicts:
app/models/project.rb
config/routes.rb
db/schema.rb
Cedric Gatay [Mon, 26 Dec 2011 23:39:42 +0000 (00:39 +0100)]
I have to domesticate RubyMine, keymapping is not the same as IntelliJ and I have deleted a character by mistake...
Cedric Gatay [Mon, 26 Dec 2011 22:22:15 +0000 (23:22 +0100)]
1/ rspec'ed
2/ @commit.safe_message as an argument
3/ preserve in helper
4/ spaces around operators
Cedric Gatay [Mon, 26 Dec 2011 20:43:38 +0000 (21:43 +0100)]
Follow up of my pull request, damn last time refactor !
Cedric Gatay [Mon, 26 Dec 2011 20:35:25 +0000 (21:35 +0100)]
Autolinks to issues in commit message (see #155)
It matches #[0-9]+ in commit messages.
For example
* Fix for #12
* Code review for #56
* Test for #15, Review on #54, Fix for #42
It only links to valid issues (existing and belonging to the current project)
It does not add any link to the commit in the issue page, it only consists in parsing the commit message when displayed.
This can be considere as a primary work for the issue #155 on gitlabhq/gitlabhq.
dbr/Ben [Mon, 26 Dec 2011 14:07:15 +0000 (06:07 -0800)]
Listify "Application details" in readme, as it was rendered as a single, confusing sentence
Ariejan de Vroom [Mon, 26 Dec 2011 09:12:09 +0000 (10:12 +0100)]
Use URI::regexp for validating WebHook urls
Ariejan de Vroom [Mon, 26 Dec 2011 09:10:21 +0000 (10:10 +0100)]
Fixed typo in spec mster => master
Dmitriy Zaporozhets [Sun, 25 Dec 2011 18:06:18 +0000 (20:06 +0200)]
fix dashboard spec
Dmitriy Zaporozhets [Sun, 25 Dec 2011 11:41:47 +0000 (03:41 -0800)]
Merge pull request #231 from CedricGatay/feature/commit_author_mail_for_note
Alert only commit author on note
Dmitriy Zaporozhets [Sun, 25 Dec 2011 11:27:51 +0000 (03:27 -0800)]
Merge pull request #215 from mutewinter/missing_favicon_link
Added missing link to favicon
Cedric Gatay [Sat, 24 Dec 2011 16:28:20 +0000 (17:28 +0100)]
Alert commit author on note
Allows to alert only the commit author when a new note is added on a commit, useful when gitlabhq is used for code
reviews, allows less noise with mails...
Dmitriy Zaporozhets [Thu, 22 Dec 2011 19:52:57 +0000 (21:52 +0200)]
fixed broken test bor truncated title
Dmitriy Zaporozhets [Thu, 22 Dec 2011 19:23:43 +0000 (11:23 -0800)]
Merge pull request #223 from argami/master
Solved issue #188
Gamaliel A. Toro Herrera [Thu, 22 Dec 2011 13:09:41 +0000 (14:09 +0100)]
Solved issue #188
Dmitriy Zaporozhets [Wed, 21 Dec 2011 07:48:23 +0000 (09:48 +0200)]
fixed activities date output for projects page
Dmitriy Zaporozhets [Tue, 20 Dec 2011 20:47:09 +0000 (22:47 +0200)]
Design tab for profile. Colorscheme as db value
Dmitriy Zaporozhets [Tue, 20 Dec 2011 17:36:23 +0000 (19:36 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Tue, 20 Dec 2011 17:36:02 +0000 (09:36 -0800)]
Merge pull request #221 from mutewinter/fix_key_add_remove_slowness
Fixes Timeout When Adding an SSH key with Many Projects
Jeremy Mack [Tue, 20 Dec 2011 14:52:04 +0000 (09:52 -0500)]
Fixes timeout when adding an SSH key
Users with many projects (>100) will hit the 20 second timeout when
updating the gitolite config. This fix batches those changes into a
signle update to the file, causing an order of magnitude speed increase
which finishes well below the 20 second timeout.
Fixes gitlabhq/gitlabhq#220
Dmitriy Zaporozhets [Tue, 20 Dec 2011 06:59:14 +0000 (08:59 +0200)]
play with tree view
Dmitriy Zaporozhets [Tue, 20 Dec 2011 06:49:14 +0000 (08:49 +0200)]
Revert "Handle back & forward events"
This reverts commit
f80745b7dbcfa6aa41a37b34ec5a9e461231f7d6.
Dmitriy Zaporozhets [Tue, 20 Dec 2011 06:39:14 +0000 (08:39 +0200)]
Handle back & forward events
Dmitriy Zaporozhets [Tue, 20 Dec 2011 06:29:14 +0000 (08:29 +0200)]
removed project filter
Dmitriy Zaporozhets [Tue, 20 Dec 2011 06:24:14 +0000 (08:24 +0200)]
Dashboard perfomance improved. Filter for projects page
Valery Sizov [Mon, 19 Dec 2011 22:07:49 +0000 (00:07 +0200)]
Merge branch 'limit_repo'
Valery Sizov [Mon, 19 Dec 2011 22:07:05 +0000 (00:07 +0200)]
fix project limit
Dmitriy Zaporozhets [Mon, 19 Dec 2011 21:32:59 +0000 (23:32 +0200)]
User profile restyle. Feed(Atom) links for commits & issues
Dmitriy Zaporozhets [Mon, 19 Dec 2011 13:17:11 +0000 (15:17 +0200)]
Merge branch 'notification_refactoring'
Valery Sizov [Sun, 18 Dec 2011 16:55:32 +0000 (18:55 +0200)]
fix notification tests
Valery Sizov [Sun, 18 Dec 2011 16:09:59 +0000 (18:09 +0200)]
fix show token in profile
Valery Sizov [Sun, 18 Dec 2011 14:36:30 +0000 (16:36 +0200)]
Notification:: small refactoring
Valery Sizov [Sun, 18 Dec 2011 14:29:58 +0000 (16:29 +0200)]
notification for note for merge request
Valery Sizov [Sun, 18 Dec 2011 14:09:16 +0000 (16:09 +0200)]
annotate model
Valery Sizov [Sun, 18 Dec 2011 14:07:47 +0000 (16:07 +0200)]
notification when assignee issue changed
Valery Sizov [Sun, 18 Dec 2011 13:46:06 +0000 (15:46 +0200)]
notification when merge request reassigned
Dmitriy Zaporozhets [Sun, 18 Dec 2011 10:10:20 +0000 (12:10 +0200)]
Added missing dependent for notes assoc
Valery Sizov [Sat, 17 Dec 2011 16:07:28 +0000 (18:07 +0200)]
Notification when created merge request
Valery Sizov [Sat, 17 Dec 2011 13:58:35 +0000 (15:58 +0200)]
Notification refactoring
Dmitriy Zaporozhets [Sat, 17 Dec 2011 13:40:31 +0000 (15:40 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Sat, 17 Dec 2011 13:40:21 +0000 (05:40 -0800)]
Merge pull request #214 from mutewinter/project_destroy_speed_fix
Project destroy relationship speed fix
Dmitriy Zaporozhets [Sat, 17 Dec 2011 09:18:27 +0000 (11:18 +0200)]
rename back button
Jeremy Mack [Fri, 16 Dec 2011 18:12:20 +0000 (13:12 -0500)]
Added missing link to favicon
Jeremy Mack [Fri, 16 Dec 2011 14:51:38 +0000 (09:51 -0500)]
Project destroy relationship speed fix
Removes destroy callback for users_projects when a project is destroyed.
This works okay becaues the gitolite config will be updated at at the
end to remove the entry entirely, thereby removing the users anyway.
Dmitriy Zaporozhets [Fri, 16 Dec 2011 09:59:07 +0000 (01:59 -0800)]
rake dev_repo: fixed for ubuntu
Dmitriy Zaporozhets [Fri, 16 Dec 2011 08:59:07 +0000 (00:59 -0800)]
Merge pull request #196 from mutewinter/bulk_repo_import
Bulk repo import Rake task
Dmitriy Zaporozhets [Thu, 15 Dec 2011 22:41:46 +0000 (00:41 +0200)]
team member show page restyle
Dmitriy Zaporozhets [Thu, 15 Dec 2011 22:00:28 +0000 (00:00 +0200)]
fix failing test with long name
Dmitriy Zaporozhets [Thu, 15 Dec 2011 21:57:46 +0000 (23:57 +0200)]
Abilities refactoring
Jeremy Mack [Thu, 15 Dec 2011 21:55:53 +0000 (16:55 -0500)]
Added detection and handling of exsiting repos
Dmitriy Zaporozhets [Thu, 15 Dec 2011 21:21:29 +0000 (23:21 +0200)]
just test fix commit
Dmitriy Zaporozhets [Thu, 15 Dec 2011 21:04:59 +0000 (23:04 +0200)]
dev seeds & dev scripts
Dmitriy Zaporozhets [Thu, 15 Dec 2011 19:42:33 +0000 (21:42 +0200)]
moved project remove button to edit section
Maciej Litwiniuk [Thu, 15 Dec 2011 11:18:33 +0000 (12:18 +0100)]
hide admin menu for non-admins
Ariejan de Vroom [Thu, 15 Dec 2011 09:33:20 +0000 (10:33 +0100)]
Added specs for special cases
We don't execute web hooks when:
* You create a new branch. Make sure you first create the branch, and then push any commits. This is the way Github works, so its expected behavior.
* When tags are pushed.
Dmitriy Zaporozhets [Thu, 15 Dec 2011 07:22:24 +0000 (09:22 +0200)]
Dashboard tabs restyle, messages if no issue or merge request
Dmitriy Zaporozhets [Thu, 15 Dec 2011 06:42:24 +0000 (08:42 +0200)]
Download link for binary
Dmitriy Zaporozhets [Thu, 15 Dec 2011 06:12:24 +0000 (08:12 +0200)]
Snippet restyle
Dmitriy Zaporozhets [Wed, 14 Dec 2011 18:53:50 +0000 (10:53 -0800)]
Merge pull request #197 from artiom/187-dashboard-merge-request-indication
Merge requests in dashboard state indication
Dmitriy Zaporozhets [Wed, 14 Dec 2011 18:53:31 +0000 (10:53 -0800)]
Merge pull request #199 from jalada/master
Image is broken on dashboard if deployed to a subdomain
Ariejan de Vroom [Wed, 14 Dec 2011 16:38:52 +0000 (17:38 +0100)]
Added web hooks functionality
This commit includes:
* Projects can have zero or more WebHooks.
* The PostReceive job will ask a project to execute any web hooks defined for that project.
* WebHook has a URL, we post Github-compatible JSON to that URL.
* Failure to execute a WebHook will be silently ignored.
David Somers [Wed, 14 Dec 2011 15:24:39 +0000 (15:24 +0000)]
Use #image_tag for dashboard tabs throbber.
Dmitriy Zaporozhets [Wed, 14 Dec 2011 06:58:35 +0000 (08:58 +0200)]
Issue restyle
Dmitriy Zaporozhets [Tue, 13 Dec 2011 21:59:58 +0000 (23:59 +0200)]
Merge branch 'master' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Tue, 13 Dec 2011 21:59:35 +0000 (23:59 +0200)]
Issue show page restyled
Dmitriy Zaporozhets [Tue, 13 Dec 2011 21:24:31 +0000 (23:24 +0200)]
merge_requests restyle with forms
Dmitriy Zaporozhets [Tue, 13 Dec 2011 18:40:45 +0000 (20:40 +0200)]
merge request show page refactored
Dmitriy Zaporozhets [Tue, 13 Dec 2011 08:07:52 +0000 (10:07 +0200)]
merge request js/css rewrite
Artiom Lunev [Tue, 13 Dec 2011 21:40:29 +0000 (23:40 +0200)]
add to merge requests in dashboard indication if closed or not fixes #187
Dmitriy Zaporozhets [Tue, 13 Dec 2011 21:34:11 +0000 (23:34 +0200)]
Merge branch 'refactor_merge_requests'
Dmitriy Zaporozhets [Tue, 13 Dec 2011 21:24:31 +0000 (23:24 +0200)]
merge_requests restyle with forms
Ariejan de Vroom [Tue, 13 Dec 2011 19:39:02 +0000 (20:39 +0100)]
Automatically write hooks when updating a repository.
Dmitriy Zaporozhets [Tue, 13 Dec 2011 18:40:45 +0000 (20:40 +0200)]
merge request show page refactored
Jeremy Mack [Tue, 13 Dec 2011 18:25:01 +0000 (13:25 -0500)]
Better description for automatically created project
Jeremy Mack [Tue, 13 Dec 2011 18:22:39 +0000 (13:22 -0500)]
Merge branch 'master' into bulk_repo_import
Conflicts:
app/views/refs/_tree.html.haml
Dmitriy Zaporozhets [Mon, 12 Dec 2011 21:17:28 +0000 (23:17 +0200)]
fix default branch
Artiom Lunev [Sun, 11 Dec 2011 22:18:51 +0000 (00:18 +0200)]
fix merge request note link
Dmitriy Zaporozhets [Mon, 12 Dec 2011 20:12:37 +0000 (22:12 +0200)]
increased breadcrumbs with & commit messages
Jeremy Mack [Mon, 12 Dec 2011 18:32:35 +0000 (13:32 -0500)]
Updated error messages to include dot as valid character
Jeremy Mack [Mon, 12 Dec 2011 18:13:11 +0000 (13:13 -0500)]
Updated validations and routes to support dots in project names
Dmitriy Zaporozhets [Mon, 12 Dec 2011 18:08:04 +0000 (20:08 +0200)]
lil js refactoring
Saito [Mon, 12 Dec 2011 16:42:07 +0000 (00:42 +0800)]
tree view readme support
Saito [Mon, 12 Dec 2011 16:41:31 +0000 (00:41 +0800)]
fix can not guess problem
Jeremy Mack [Tue, 13 Dec 2011 13:49:08 +0000 (08:49 -0500)]
Add rake task for bulk repo importing
Git repos should be in the import_projects directory in the root of
application. The task is invoked via @rake import_projects@.
Jeremy Mack [Tue, 13 Dec 2011 14:18:36 +0000 (09:18 -0500)]
Calling update_repository
- Better comment too
Dmitriy Zaporozhets [Tue, 13 Dec 2011 18:08:33 +0000 (10:08 -0800)]
Merge pull request #195 from randaalex/db_seed_fu_upd
Demo issues title update