OSDN Git Service
Dmitriy Zaporozhets [Mon, 14 Oct 2013 10:48:05 +0000 (10:48 +0000)]
Merge branch 'web_hook_project_id' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Mon, 14 Oct 2013 10:03:25 +0000 (12:03 +0200)]
Include project_id in webhook payload.
Dmitriy Zaporozhets [Mon, 14 Oct 2013 08:46:27 +0000 (08:46 +0000)]
Merge branch 'syshook-docs' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Mon, 14 Oct 2013 07:24:38 +0000 (09:24 +0200)]
System hooks docs links to admin area.
Dmitriy Zaporozhets [Mon, 14 Oct 2013 07:00:58 +0000 (07:00 +0000)]
Merge branch 'sidekiq_restart' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 14 Oct 2013 06:57:43 +0000 (06:57 +0000)]
Merge branch 'cookies-in-redis' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sun, 13 Oct 2013 13:03:16 +0000 (16:03 +0300)]
Fix README detection for subdir
Dmitriy Zaporozhets [Sun, 13 Oct 2013 11:38:20 +0000 (14:38 +0300)]
Improve admin dashboard UX
Dmitriy Zaporozhets [Sun, 13 Oct 2013 11:22:40 +0000 (14:22 +0300)]
Revert "Move warning about 0 ssh keys to bottom of page"
This reverts commit
20c47923a10bfeb6dcd895adfcf05c78c696ec7f.
Dmitriy Zaporozhets [Sun, 13 Oct 2013 08:11:10 +0000 (11:11 +0300)]
Move warning about 0 ssh keys to bottom of page
Dmitriy Zaporozhets [Sun, 13 Oct 2013 08:00:51 +0000 (11:00 +0300)]
Lighter border color for ui-box. Show closed keyword for issues list
Dmitriy Zaporozhets [Sat, 12 Oct 2013 07:01:27 +0000 (10:01 +0300)]
Fix 500 error on page with submodules
Dmitriy Zaporozhets [Sat, 12 Oct 2013 05:06:19 +0000 (05:06 +0000)]
Merge branch 'fix/relative_render' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Fri, 11 Oct 2013 19:41:33 +0000 (21:41 +0200)]
Skip relative links render in help page.
Sytse Sijbrandij [Fri, 11 Oct 2013 15:54:38 +0000 (17:54 +0200)]
The cookie store is vulnerable to session replay attacks.
Dmitriy Zaporozhets [Fri, 11 Oct 2013 13:02:30 +0000 (13:02 +0000)]
Merge branch 'permission-levels' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 11 Oct 2013 13:00:05 +0000 (13:00 +0000)]
Merge branch 'relative_links_in_documentation' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Fri, 11 Oct 2013 11:44:00 +0000 (13:44 +0200)]
Test if markdown is rendered properly.
Sytse Sijbrandij [Fri, 11 Oct 2013 10:15:18 +0000 (12:15 +0200)]
Add information about admin.
Dmitriy Zaporozhets [Fri, 11 Oct 2013 09:32:38 +0000 (09:32 +0000)]
Merge branch 'wiki_backup' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 11 Oct 2013 09:32:12 +0000 (09:32 +0000)]
Merge branch 'consistent-naming-of-user-and-profile-page' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Fri, 11 Oct 2013 08:40:22 +0000 (10:40 +0200)]
Explain how group and project permissions interact.
Marin Jankovski [Fri, 11 Oct 2013 08:00:50 +0000 (10:00 +0200)]
Merge branch 'master' into relative_links_in_documentation
Dmitriy Zaporozhets [Thu, 10 Oct 2013 14:17:50 +0000 (07:17 -0700)]
Merge pull request #5253 from karlhungus/feature-api-download-archive
Feature api download archive
Dmitriy Zaporozhets [Thu, 10 Oct 2013 14:17:22 +0000 (07:17 -0700)]
Merge pull request #4736 from karlhungus/feature-create-wiki-repo-on-repo-enabled
Create a wiki when wiki_enabled:true
Jacob Vosmaer [Wed, 9 Oct 2013 15:17:04 +0000 (17:17 +0200)]
Skip rather than fail empty wikis during backup
Izaak Alpert [Mon, 7 Oct 2013 20:14:13 +0000 (16:14 -0400)]
Remove file compairson
Change-Id: Id2cae87c8cd383bc6cbcbdecf0f77c161bb82eab
Izaak Alpert [Wed, 2 Oct 2013 20:37:11 +0000 (16:37 -0400)]
Added more tests for archive api
Change-Id: I2b0752bc2593a944d42dde0ffe0ef9ce408228a5
Izaak Alpert [Wed, 2 Oct 2013 14:47:23 +0000 (10:47 -0400)]
Fix a bug where the tgz returned got encoded utf8
Conflicts:
doc/api/repositories.md
Change-Id: I7ebc39b47ff860813d9622ba6776583536e6e384
Izaak Alpert [Thu, 26 Sep 2013 20:42:49 +0000 (16:42 -0400)]
feature API call to download repo archive
defaults to HEAD
Conflicts:
spec/requests/api/repositories_spec.rb
Change-Id: Id114aca6c59d75f18e49bf9f33809a04e010bfb6
Izaak Alpert [Thu, 10 Oct 2013 13:05:59 +0000 (09:05 -0400)]
Updated missed styles
Change-Id: I05e02ff7e36e2350cdf5d2b94095ada9760a204e
Izaak Alpert [Mon, 7 Oct 2013 20:24:40 +0000 (16:24 -0400)]
Fix style issues
Change-Id: I1ffe18414b7f6eae38d7860a8e3b64a9a185273f
Izaak Alpert [Tue, 10 Sep 2013 13:57:34 +0000 (09:57 -0400)]
Brings this fix inline with updates to master
Change-Id: Ia50c3ac043b4c927ca59cbbdc2bba42f73e550e4
Izaak Alpert [Wed, 7 Aug 2013 19:45:57 +0000 (15:45 -0400)]
Create a wiki when wiki_enabled:true
Change-Id: I7aaab4b1f54fd2719a8a63d9069ddd5c59868e34
Marin Jankovski [Thu, 10 Oct 2013 13:09:12 +0000 (15:09 +0200)]
Merge branch 'master' into relative_links_in_documentation
Marin Jankovski [Thu, 10 Oct 2013 12:29:16 +0000 (14:29 +0200)]
Cover a special case.
Marin Jankovski [Thu, 10 Oct 2013 09:16:15 +0000 (11:16 +0200)]
Added comments and split the methods further.
Dmitriy Zaporozhets [Thu, 10 Oct 2013 09:14:21 +0000 (12:14 +0300)]
Remove unnecessary tag
Sytse Sijbrandij [Thu, 10 Oct 2013 08:43:24 +0000 (10:43 +0200)]
Consistent naming to make difference between clicking on profile pic and profile settings clear.
Dmitriy Zaporozhets [Thu, 10 Oct 2013 08:05:49 +0000 (11:05 +0300)]
Avoid 500 error on project page when application is close to RAM limit
Dmitriy Zaporozhets [Thu, 10 Oct 2013 07:53:49 +0000 (10:53 +0300)]
Use link_to_project helper
Dmitriy Zaporozhets [Thu, 10 Oct 2013 07:30:07 +0000 (10:30 +0300)]
Improve Profile#account page UI
Dmitriy Zaporozhets [Thu, 10 Oct 2013 04:58:17 +0000 (04:58 +0000)]
Merge branch 'refactor/profile_account' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 9 Oct 2013 16:36:51 +0000 (16:36 +0000)]
Merge branch 'feature/devise_email_async' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 9 Oct 2013 16:03:09 +0000 (19:03 +0300)]
Fix profile specs
Jacob Vosmaer [Wed, 9 Oct 2013 15:14:55 +0000 (17:14 +0200)]
Add GollumWiki#empty? method
Jacob Vosmaer [Wed, 9 Oct 2013 14:49:01 +0000 (16:49 +0200)]
Use sidekiq restart rake task in init script
Dmitriy Zaporozhets [Wed, 9 Oct 2013 14:01:04 +0000 (17:01 +0300)]
Fix spinach profile tests
Dmitriy Zaporozhets [Wed, 9 Oct 2013 13:52:03 +0000 (13:52 +0000)]
Reverted accidently removed registration module
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:37:37 +0000 (16:37 +0300)]
Restyle Profile#Account page
Dmitriy Zaporozhets [Wed, 9 Oct 2013 13:37:18 +0000 (16:37 +0300)]
Move profile account to separate controller
Dmitriy Zaporozhets [Wed, 9 Oct 2013 13:17:40 +0000 (16:17 +0300)]
Separate page for password change
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
Marin Jankovski [Wed, 9 Oct 2013 13:01:02 +0000 (15:01 +0200)]
Rename method to avoid clashes.
Dmitriy Zaporozhets [Wed, 9 Oct 2013 12:25:31 +0000 (15:25 +0300)]
Send devise emails async
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
Marin Jankovski [Wed, 9 Oct 2013 11:28:25 +0000 (13:28 +0200)]
Split.
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
Marin Jankovski [Wed, 9 Oct 2013 09:07:45 +0000 (11:07 +0200)]
Merge branch 'master' into relative_links_in_documentation
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
Marin Jankovski [Tue, 8 Oct 2013 13:38:24 +0000 (15:38 +0200)]
Match the brackets so we don't replace the regular text.
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
Marin Jankovski [Tue, 8 Oct 2013 12:21:01 +0000 (14:21 +0200)]
Check for wiki.
Marin Jankovski [Tue, 8 Oct 2013 11:02:30 +0000 (13:02 +0200)]
Show links with correct ref.
Marin Jankovski [Tue, 8 Oct 2013 10:24:50 +0000 (12:24 +0200)]
Search and replace relative links in tree/readme
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.