OSDN Git Service
Jacob Vosmaer [Wed, 9 Oct 2013 14:49:01 +0000 (16:49 +0200)]
Use sidekiq restart rake task in init script
Jacob Vosmaer [Wed, 9 Oct 2013 13:48:28 +0000 (15:48 +0200)]
Use built-in sidekiq deamonization
Jacob Vosmaer [Wed, 9 Oct 2013 13:46:00 +0000 (15:46 +0200)]
Remove duplicate log path generation
Jacob Vosmaer [Wed, 9 Oct 2013 13:44:25 +0000 (15:44 +0200)]
Always shut down sidekiq before starting
Dmitriy Zaporozhets [Wed, 9 Oct 2013 13:22:37 +0000 (13:22 +0000)]
Merge branch 'feature/api_remove_project' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 9 Oct 2013 11:43:18 +0000 (14:43 +0300)]
API: docs for remove project
Dmitriy Zaporozhets [Wed, 9 Oct 2013 11:41:54 +0000 (14:41 +0300)]
API: specs for remove project
Dmitriy Zaporozhets [Wed, 9 Oct 2013 11:41:41 +0000 (14:41 +0300)]
API: new feature - remove project[D
Dmitriy Zaporozhets [Wed, 9 Oct 2013 11:19:38 +0000 (14:19 +0300)]
Remove test case that cause Mysql Deadlock
Dmitriy Zaporozhets [Wed, 9 Oct 2013 11:10:09 +0000 (04:10 -0700)]
Merge pull request #5291 from astratto/title_issue_trackers
Use proper titles for issues trackers
Dmitriy Zaporozhets [Wed, 9 Oct 2013 09:30:49 +0000 (12:30 +0300)]
Improve Profile settings UI
Dmitriy Zaporozhets [Wed, 9 Oct 2013 09:19:29 +0000 (02:19 -0700)]
Merge pull request #5281 from Popl7/upload_avatar_to_gitlab
avatar upload on profile page
Stefano Tortarolo [Tue, 8 Oct 2013 14:21:40 +0000 (16:21 +0200)]
Use proper titles for issues trackers
Steven Thonus [Sun, 6 Oct 2013 18:13:56 +0000 (20:13 +0200)]
avatar upload on profile page
Dmitriy Zaporozhets [Wed, 9 Oct 2013 06:58:02 +0000 (23:58 -0700)]
Merge pull request #5278 from ZaaLabs/master
Small consistency addition for installation.md
Dmitriy Zaporozhets [Tue, 8 Oct 2013 13:53:15 +0000 (06:53 -0700)]
Merge pull request #5290 from zzet/patch-3
Update merge requests from fork project to origin project
Andrew Kumanyaev [Tue, 8 Oct 2013 12:45:57 +0000 (16:45 +0400)]
Update merge requests from fork project to origin project
Fix error described in https://github.com/gitlabhq/gitlabhq/issues/5185
Dmitriy Zaporozhets [Tue, 8 Oct 2013 09:28:27 +0000 (09:28 +0000)]
Merge branch 'feature/system_hook_user_id' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 8 Oct 2013 09:06:46 +0000 (12:06 +0300)]
Fix system hook page description
Dmitriy Zaporozhets [Tue, 8 Oct 2013 08:11:33 +0000 (08:11 +0000)]
Merge branch 'mr_votes_api' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 8 Oct 2013 08:06:38 +0000 (11:06 +0300)]
Mention SystemHook user_id in sample. Extend tests
Dmitriy Zaporozhets [Tue, 8 Oct 2013 07:54:40 +0000 (10:54 +0300)]
Add user_id to system hook when new user created
Islam Amer [Mon, 2 Sep 2013 15:36:05 +0000 (15:36 +0000)]
Expose votes in merge request api
Signed-off-by: Islam Amer <islam.amer@jollamobile.com>
Dmitriy Zaporozhets [Tue, 8 Oct 2013 06:03:20 +0000 (06:03 +0000)]
Merge branch 'feature/ssh_ldap_check' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 7 Oct 2013 16:42:59 +0000 (19:42 +0300)]
Fix merge request model spec
Dmitriy Zaporozhets [Mon, 7 Oct 2013 13:56:02 +0000 (16:56 +0300)]
Fix avatar margin for files view
Dmitriy Zaporozhets [Mon, 7 Oct 2013 13:06:30 +0000 (16:06 +0300)]
Check if LDAP user was removed or blocked when use git over ssh
Dmitriy Zaporozhets [Mon, 7 Oct 2013 12:45:31 +0000 (15:45 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Mon, 7 Oct 2013 12:45:20 +0000 (12:45 +0000)]
Merge branch 'sidekiq_stop' of /home/git/repositories/gitlab/gitlabhq
Jacob Vosmaer [Mon, 7 Oct 2013 11:32:33 +0000 (13:32 +0200)]
Run stopping commands in the foreground
Jacob Vosmaer [Mon, 7 Oct 2013 12:16:04 +0000 (14:16 +0200)]
Fix sudo commands in update guides
Dmitriy Zaporozhets [Mon, 7 Oct 2013 11:49:01 +0000 (14:49 +0300)]
Fix bugs when discussion visible in wrong project
Because notes scope was not limited by project in
MergeRequest#mr_and_commit_notes it causes comments from project A
appears in discussions for MR in project B.
Dmitriy Zaporozhets [Mon, 7 Oct 2013 11:32:25 +0000 (11:32 +0000)]
Merge branch 'feature/api_remove_group' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 7 Oct 2013 10:35:09 +0000 (03:35 -0700)]
Merge pull request #5158 from tkoenig/fix-active-milestone-order
Sort active milestones by due date (upcoming first)
Dmitriy Zaporozhets [Mon, 7 Oct 2013 10:29:00 +0000 (10:29 +0000)]
Merge branch 'check_hooks' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 7 Oct 2013 10:27:32 +0000 (13:27 +0300)]
Mention remove group api in CHANGELOG
Dmitriy Zaporozhets [Mon, 7 Oct 2013 10:18:37 +0000 (13:18 +0300)]
Remove group api specs
Dmitriy Zaporozhets [Mon, 7 Oct 2013 10:10:01 +0000 (13:10 +0300)]
API: new feature - remove group
Jacob Vosmaer [Mon, 7 Oct 2013 09:27:38 +0000 (11:27 +0200)]
Add troubleshooting hints to update hook check
Dmitriy Zaporozhets [Mon, 7 Oct 2013 05:44:03 +0000 (22:44 -0700)]
Merge pull request #5230 from cmckni3/patch-1
Fix invalid json in API docs
Nate Beck [Sun, 6 Oct 2013 09:55:01 +0000 (02:55 -0700)]
Update installation.md
Add the -y option to the python apt-get install commands to be consistent with the rest of the Document.
Dmitriy Zaporozhets [Fri, 4 Oct 2013 15:00:51 +0000 (08:00 -0700)]
Merge pull request #5216 from bladealslayer/feature/flowdock_integration
Added Flowdock integration support via a service.
Dmitriy Zaporozhets [Fri, 4 Oct 2013 13:26:49 +0000 (13:26 +0000)]
Merge branch 'satellite_merge' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Fri, 4 Oct 2013 11:26:48 +0000 (13:26 +0200)]
Remove outdated comments.
Dmitriy Zaporozhets [Fri, 4 Oct 2013 11:24:27 +0000 (11:24 +0000)]
Merge branch 'improve_sidekiq_check' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 4 Oct 2013 11:22:43 +0000 (14:22 +0300)]
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 4 Oct 2013 11:17:12 +0000 (11:17 +0000)]
Merge branch 'requirements-cloud-experience' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Fri, 4 Oct 2013 10:38:49 +0000 (12:38 +0200)]
Fix failed merge when filename is the same as target branchname.
Sytse Sijbrandij [Fri, 4 Oct 2013 10:20:40 +0000 (12:20 +0200)]
Better requirements based on the experience of GitLab Cloud.
Jacob Vosmaer [Fri, 4 Oct 2013 09:18:44 +0000 (11:18 +0200)]
Only kill sidekiqs belonging to gitlab user
Boyan Tabakov [Thu, 3 Oct 2013 13:29:13 +0000 (16:29 +0300)]
Use gitlab-flowdock-git-hook patched for dependency on gitlab-grit, instead of grit.
Make sure the flowdock-git-hook is loaded. Seems it is not autoloader, due to the gem/lib name mismatch.
Jacob Vosmaer [Thu, 3 Oct 2013 13:21:05 +0000 (06:21 -0700)]
Merge pull request #5262 from yatish27/master
Typo:Corrected the typo of sign-in in User Model
Jacob Vosmaer [Thu, 3 Oct 2013 13:17:27 +0000 (06:17 -0700)]
Merge pull request #5160 from nummy/patch-1
Improve 6.0-to-6.1.md update guide
Yatish Mehta [Thu, 3 Oct 2013 09:04:51 +0000 (14:34 +0530)]
Typo:Corrected the typo of sign-in in User Model
Dmitriy Zaporozhets [Thu, 3 Oct 2013 06:33:39 +0000 (09:33 +0300)]
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 3 Oct 2013 06:27:47 +0000 (06:27 +0000)]
Merge branch 'update_api_documentation' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Wed, 2 Oct 2013 14:41:01 +0000 (16:41 +0200)]
Update group access levels in docs.
Dmitriy Zaporozhets [Wed, 2 Oct 2013 14:14:49 +0000 (14:14 +0000)]
Merge branch 'broader-message-matching' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 2 Oct 2013 14:14:09 +0000 (14:14 +0000)]
Merge branch 'pg_installation' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 2 Oct 2013 14:11:08 +0000 (14:11 +0000)]
Merge branch 'new-site' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 2 Oct 2013 14:10:44 +0000 (14:10 +0000)]
Merge branch 'add-backup-to-readme' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Wed, 2 Oct 2013 13:02:54 +0000 (15:02 +0200)]
Add direct link to backup task and some other interfaces.
Sytse Sijbrandij [Wed, 2 Oct 2013 12:43:11 +0000 (14:43 +0200)]
Adapt readme to website redesign.
Marin Jankovski [Wed, 2 Oct 2013 10:51:43 +0000 (12:51 +0200)]
Removed user teams api docs.
Marin Jankovski [Wed, 2 Oct 2013 10:50:01 +0000 (12:50 +0200)]
Update deploy keys, groups and system hooks api docs.
Marin Jankovski [Wed, 2 Oct 2013 10:08:07 +0000 (12:08 +0200)]
Update issues, milestones, notes api docs.
Marin Jankovski [Wed, 2 Oct 2013 09:04:51 +0000 (11:04 +0200)]
Update snippets and merge request api documentation
Jacob Vosmaer [Wed, 2 Oct 2013 08:28:01 +0000 (10:28 +0200)]
Use mkdir -p in 4.2-to-5.0.md update guide
Jacob Vosmaer [Wed, 2 Oct 2013 07:29:40 +0000 (09:29 +0200)]
Add -H to sudo commands in 4.1-to-4.2.md
Sytse Sijbrandij [Wed, 2 Oct 2013 06:23:27 +0000 (08:23 +0200)]
Correct spelling mistake.
Jacob Vosmaer [Wed, 2 Oct 2013 06:05:52 +0000 (08:05 +0200)]
Use peer-based authentication for PostgreSQL
Jacob Vosmaer [Wed, 2 Oct 2013 06:05:32 +0000 (08:05 +0200)]
Streamline MySQL setup in installation.md
Marin Jankovski [Tue, 1 Oct 2013 21:13:09 +0000 (23:13 +0200)]
Update project api docs.
Dmitriy Zaporozhets [Tue, 1 Oct 2013 17:34:41 +0000 (20:34 +0300)]
Refactor blob finding
Dmitriy Zaporozhets [Tue, 1 Oct 2013 16:12:56 +0000 (16:12 +0000)]
Merge branch 'improve/gitlab_git_3' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 1 Oct 2013 15:26:55 +0000 (18:26 +0300)]
Fix blob and repo stuff after gitlab_git v3
Dmitriy Zaporozhets [Tue, 1 Oct 2013 14:08:40 +0000 (17:08 +0300)]
Fix edit file
Dmitriy Zaporozhets [Tue, 1 Oct 2013 14:00:28 +0000 (17:00 +0300)]
Update code to work with gitlab_git 3
Dmitriy Zaporozhets [Tue, 1 Oct 2013 12:15:28 +0000 (15:15 +0300)]
Annotate!
Dmitriy Zaporozhets [Tue, 1 Oct 2013 12:15:14 +0000 (15:15 +0300)]
Use annotate from rubygems
Marin Jankovski [Tue, 1 Oct 2013 11:52:57 +0000 (13:52 +0200)]
Update user api documentation
Sytse Sijbrandij [Tue, 1 Oct 2013 09:43:53 +0000 (11:43 +0200)]
Also update example.
Sytse Sijbrandij [Tue, 1 Oct 2013 08:53:44 +0000 (10:53 +0200)]
Also match if it is at the end or in the middle of a sentence.
Dmitriy Zaporozhets [Tue, 1 Oct 2013 08:14:05 +0000 (08:14 +0000)]
Merge branch 'rack_attack' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Tue, 1 Oct 2013 08:05:58 +0000 (10:05 +0200)]
Update install/update docs.
Chris McKnight [Tue, 1 Oct 2013 02:45:15 +0000 (21:45 -0500)]
Fix json keys in groups API documentation
Chris McKnight [Mon, 30 Sep 2013 22:39:33 +0000 (17:39 -0500)]
Fix invalid json in issues API doc
Dmitriy Zaporozhets [Mon, 30 Sep 2013 14:04:40 +0000 (07:04 -0700)]
Merge pull request #5200 from pfaro/bugfix-signup
Add check if the signup setting is enabled. fixes #4832
Dmitriy Zaporozhets [Mon, 30 Sep 2013 13:49:55 +0000 (16:49 +0300)]
Refactor API: project hooks
Dmitriy Zaporozhets [Mon, 30 Sep 2013 13:47:26 +0000 (16:47 +0300)]
API: Protect project deploy keys from unauthorized access
Jacob Vosmaer [Mon, 30 Sep 2013 12:42:59 +0000 (05:42 -0700)]
Merge pull request #4902 from misilot/missing-config-unicorn.rb
Add hints for relative URL installation
Dmitriy Zaporozhets [Mon, 30 Sep 2013 10:59:29 +0000 (13:59 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Mon, 30 Sep 2013 10:59:16 +0000 (13:59 +0300)]
Remove grit require
Dmitriy Zaporozhets [Mon, 30 Sep 2013 09:50:31 +0000 (02:50 -0700)]
Merge pull request #5221 from Turbo87/patch-1
Fixed typo in groups.md
Marin Jankovski [Thu, 26 Sep 2013 20:40:55 +0000 (22:40 +0200)]
Add documentation to help section, rack_attack as example
Tobias Bieniek [Mon, 30 Sep 2013 09:01:57 +0000 (11:01 +0200)]
Fixed typo in groups.md
Dmitriy Zaporozhets [Mon, 30 Sep 2013 06:55:48 +0000 (09:55 +0300)]
Fix Api session spec
Dmitriy Zaporozhets [Mon, 30 Sep 2013 06:50:30 +0000 (09:50 +0300)]
Few UI fixes for notes
Dmitriy Zaporozhets [Mon, 30 Sep 2013 06:27:45 +0000 (09:27 +0300)]
Add more entries to 6.2.0 CHANGELOG
Dmitriy Zaporozhets [Mon, 30 Sep 2013 06:03:46 +0000 (23:03 -0700)]
Merge pull request #5213 from bladealslayer/feature/user_api_extended
Extended User API to expose admin and can_create_group for user creation...