8512307614
Use sidekiq restart rake task in init script
2013-10-09 16:49:01 +02:00
97f124b31d
Use built-in sidekiq deamonization
2013-10-09 15:51:39 +02:00
7991b04499
Remove duplicate log path generation
2013-10-09 15:51:39 +02:00
2128419c5b
Always shut down sidekiq before starting
2013-10-09 15:51:39 +02:00
7af1bc3b88
Merge branch 'feature/api_remove_project' of /home/git/repositories/gitlab/gitlabhq
2013-10-09 13:22:37 +00:00
51825e434e
API: docs for remove project
2013-10-09 14:43:18 +03:00
4416be54a9
API: specs for remove project
2013-10-09 14:41:54 +03:00
c8e7d6df79
API: new feature - remove project[D
2013-10-09 14:41:41 +03:00
551fa4c9d0
Remove test case that cause Mysql Deadlock
2013-10-09 14:19:38 +03:00
a37b8ab2b2
Merge pull request #5291 from astratto/title_issue_trackers
...
Use proper titles for issues trackers
2013-10-09 04:10:09 -07:00
87ffd67617
Improve Profile settings UI
2013-10-09 12:30:49 +03:00
3fb1042d77
Merge pull request #5281 from Popl7/upload_avatar_to_gitlab
...
avatar upload on profile page
2013-10-09 02:19:29 -07:00
65f5d062e9
Use proper titles for issues trackers
2013-10-09 09:21:53 +02:00
65cad57a35
avatar upload on profile page
2013-10-09 09:05:09 +02:00
6fbb7e6c5c
Merge pull request #5278 from ZaaLabs/master
...
Small consistency addition for installation.md
2013-10-08 23:58:02 -07:00
358426d661
Merge pull request #5290 from zzet/patch-3
...
Update merge requests from fork project to origin project
2013-10-08 06:53:15 -07:00
9ee49c5c49
Update merge requests from fork project to origin project
...
Fix error described in https://github.com/gitlabhq/gitlabhq/issues/5185
2013-10-08 16:45:57 +04:00
c147b571f4
Merge branch 'feature/system_hook_user_id' of /home/git/repositories/gitlab/gitlabhq
2013-10-08 09:28:27 +00:00
5cf31b92c4
Fix system hook page description
2013-10-08 12:06:46 +03:00
9651457260
Merge branch 'mr_votes_api' of /home/git/repositories/gitlab/gitlabhq
2013-10-08 08:11:33 +00:00
9a0329016b
Mention SystemHook user_id in sample. Extend tests
2013-10-08 11:06:38 +03:00
3d51147de1
Add user_id to system hook when new user created
2013-10-08 10:54:40 +03:00
29c807ced3
Expose votes in merge request api
...
Signed-off-by: Islam Amer <islam.amer@jollamobile.com>
2013-10-08 09:32:00 +02:00
07437ac3d4
Merge branch 'feature/ssh_ldap_check' of /home/git/repositories/gitlab/gitlabhq
2013-10-08 06:03:20 +00:00
db10e6aaa6
Fix merge request model spec
2013-10-07 19:42:59 +03:00
eb7072de91
Fix avatar margin for files view
2013-10-07 16:56:02 +03:00
baa65e89b9
Check if LDAP user was removed or blocked when use git over ssh
2013-10-07 16:06:30 +03:00
2db9410945
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2013-10-07 15:45:31 +03:00
bef632e816
Merge branch 'sidekiq_stop' of /home/git/repositories/gitlab/gitlabhq
2013-10-07 12:45:20 +00:00
78b3fb769c
Run stopping commands in the foreground
2013-10-07 14:40:56 +02:00
83e9825c97
Fix sudo commands in update guides
2013-10-07 14:16:04 +02:00
b658489f27
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.
2013-10-07 14:49:01 +03:00
dc825ae330
Merge branch 'feature/api_remove_group' of /home/git/repositories/gitlab/gitlabhq
2013-10-07 11:32:25 +00:00
2eb76186f5
Merge pull request #5158 from tkoenig/fix-active-milestone-order
...
Sort active milestones by due date (upcoming first)
2013-10-07 03:35:09 -07:00
3db47d12f2
Merge branch 'check_hooks' of /home/git/repositories/gitlab/gitlabhq
2013-10-07 10:29:00 +00:00
93341579b6
Mention remove group api in CHANGELOG
2013-10-07 13:27:32 +03:00
1a18e778f5
Remove group api specs
2013-10-07 13:18:37 +03:00
f141711cfd
API: new feature - remove group
2013-10-07 13:10:01 +03:00
99916fe159
Add troubleshooting hints to update hook check
2013-10-07 11:27:38 +02:00
073c8a2966
Merge pull request #5230 from cmckni3/patch-1
...
Fix invalid json in API docs
2013-10-06 22:44:03 -07:00
c6d6c0d114
Update installation.md
...
Add the -y option to the python apt-get install commands to be consistent with the rest of the Document.
2013-10-06 02:55:01 -07:00
83c727c550
Merge pull request #5216 from bladealslayer/feature/flowdock_integration
...
Added Flowdock integration support via a service.
2013-10-04 08:00:51 -07:00
dc00562fa2
Merge branch 'satellite_merge' of /home/git/repositories/gitlab/gitlabhq
2013-10-04 13:26:49 +00:00
a817993439
Remove outdated comments.
2013-10-04 13:26:48 +02:00
d3450ad2be
Merge branch 'improve_sidekiq_check' of /home/git/repositories/gitlab/gitlabhq
2013-10-04 11:24:27 +00:00
0223597aca
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2013-10-04 14:22:43 +03:00
499158a4d2
Merge branch 'requirements-cloud-experience' of /home/git/repositories/gitlab/gitlabhq
2013-10-04 11:17:12 +00:00
fa7d75733c
Fix failed merge when filename is the same as target branchname.
2013-10-04 12:38:49 +02:00
363c5204d9
Better requirements based on the experience of GitLab Cloud.
2013-10-04 12:20:40 +02:00
4017789f5a
Only kill sidekiqs belonging to gitlab user
2013-10-04 11:25:44 +02:00
Jacob Vosmaer
Dmitriy Zaporozhets
Stefano Tortarolo
Steven Thonus
Andrew Kumanyaev
Islam Amer
Nate Beck
Marin Jankovski
Sytse Sijbrandij