Dmitriy Zaporozhets
d1ffbdfcb6
Avoid 500 error on project page when application is close to RAM limit
2013-10-10 11:05:49 +03:00
Dmitriy Zaporozhets
bd83991ac7
Use link_to_project helper
2013-10-10 10:53:49 +03:00
Dmitriy Zaporozhets
573c89e624
Improve Profile#account page UI
2013-10-10 10:30:07 +03:00
Dmitriy Zaporozhets
1935b494f6
Merge branch 'refactor/profile_account' of /home/git/repositories/gitlab/gitlabhq
2013-10-10 04:58:17 +00:00
Dmitriy Zaporozhets
f89a74718a
Merge branch 'feature/devise_email_async' of /home/git/repositories/gitlab/gitlabhq
2013-10-09 16:36:51 +00:00
Dmitriy Zaporozhets
dd68e37db3
Fix profile specs
2013-10-09 19:03:09 +03:00
Dmitriy Zaporozhets
e50c0d5cb7
Fix spinach profile tests
2013-10-09 17:01:04 +03:00
Dmitriy Zaporozhets
92768844cf
Reverted accidently removed registration module
2013-10-09 13:52:03 +00:00
Dmitriy Zaporozhets
ffec158de4
Restyle Profile#Account page
2013-10-09 16:43:24 +03:00
Dmitriy Zaporozhets
4c8224ae1e
Move profile account to separate controller
2013-10-09 16:43:17 +03:00
Dmitriy Zaporozhets
c41e66db52
Separate page for password change
2013-10-09 16:43:11 +03:00
Dmitriy Zaporozhets
7af1bc3b88
Merge branch 'feature/api_remove_project' of /home/git/repositories/gitlab/gitlabhq
2013-10-09 13:22:37 +00:00
Dmitriy Zaporozhets
f7ef23e412
Send devise emails async
2013-10-09 15:25:31 +03:00
Dmitriy Zaporozhets
51825e434e
API: docs for remove project
2013-10-09 14:43:18 +03:00
Dmitriy Zaporozhets
4416be54a9
API: specs for remove project
2013-10-09 14:41:54 +03:00
Dmitriy Zaporozhets
c8e7d6df79
API: new feature - remove project[D
2013-10-09 14:41:41 +03:00
Dmitriy Zaporozhets
551fa4c9d0
Remove test case that cause Mysql Deadlock
2013-10-09 14:19:38 +03:00
Dmitriy Zaporozhets
a37b8ab2b2
Merge pull request #5291 from astratto/title_issue_trackers
...
Use proper titles for issues trackers
2013-10-09 04:10:09 -07:00
Dmitriy Zaporozhets
87ffd67617
Improve Profile settings UI
2013-10-09 12:30:49 +03:00
Dmitriy Zaporozhets
3fb1042d77
Merge pull request #5281 from Popl7/upload_avatar_to_gitlab
...
avatar upload on profile page
2013-10-09 02:19:29 -07:00
Stefano Tortarolo
65f5d062e9
Use proper titles for issues trackers
2013-10-09 09:21:53 +02:00
Steven Thonus
65cad57a35
avatar upload on profile page
2013-10-09 09:05:09 +02:00
Dmitriy Zaporozhets
6fbb7e6c5c
Merge pull request #5278 from ZaaLabs/master
...
Small consistency addition for installation.md
2013-10-08 23:58:02 -07:00
Dmitriy Zaporozhets
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
Andrew Kumanyaev
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
Dmitriy Zaporozhets
c147b571f4
Merge branch 'feature/system_hook_user_id' of /home/git/repositories/gitlab/gitlabhq
2013-10-08 09:28:27 +00:00
Dmitriy Zaporozhets
5cf31b92c4
Fix system hook page description
2013-10-08 12:06:46 +03:00
Dmitriy Zaporozhets
9651457260
Merge branch 'mr_votes_api' of /home/git/repositories/gitlab/gitlabhq
2013-10-08 08:11:33 +00:00
Dmitriy Zaporozhets
9a0329016b
Mention SystemHook user_id in sample. Extend tests
2013-10-08 11:06:38 +03:00
Dmitriy Zaporozhets
3d51147de1
Add user_id to system hook when new user created
2013-10-08 10:54:40 +03:00
Islam Amer and Jacob Vosmaer
29c807ced3
Expose votes in merge request api
...
Signed-off-by: Islam Amer <islam.amer@jollamobile.com >
2013-10-08 09:32:00 +02:00
Dmitriy Zaporozhets
07437ac3d4
Merge branch 'feature/ssh_ldap_check' of /home/git/repositories/gitlab/gitlabhq
2013-10-08 06:03:20 +00:00
Dmitriy Zaporozhets
db10e6aaa6
Fix merge request model spec
2013-10-07 19:42:59 +03:00
Dmitriy Zaporozhets
eb7072de91
Fix avatar margin for files view
2013-10-07 16:56:02 +03:00
Dmitriy Zaporozhets
baa65e89b9
Check if LDAP user was removed or blocked when use git over ssh
2013-10-07 16:06:30 +03:00
Dmitriy Zaporozhets
2db9410945
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2013-10-07 15:45:31 +03:00
Dmitriy Zaporozhets
bef632e816
Merge branch 'sidekiq_stop' of /home/git/repositories/gitlab/gitlabhq
2013-10-07 12:45:20 +00:00
Jacob Vosmaer
78b3fb769c
Run stopping commands in the foreground
2013-10-07 14:40:56 +02:00
Jacob Vosmaer
83e9825c97
Fix sudo commands in update guides
2013-10-07 14:16:04 +02:00
Dmitriy Zaporozhets
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
Dmitriy Zaporozhets
dc825ae330
Merge branch 'feature/api_remove_group' of /home/git/repositories/gitlab/gitlabhq
2013-10-07 11:32:25 +00:00
Dmitriy Zaporozhets
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
Dmitriy Zaporozhets
3db47d12f2
Merge branch 'check_hooks' of /home/git/repositories/gitlab/gitlabhq
2013-10-07 10:29:00 +00:00
Dmitriy Zaporozhets
93341579b6
Mention remove group api in CHANGELOG
2013-10-07 13:27:32 +03:00
Dmitriy Zaporozhets
1a18e778f5
Remove group api specs
2013-10-07 13:18:37 +03:00
Dmitriy Zaporozhets
f141711cfd
API: new feature - remove group
2013-10-07 13:10:01 +03:00
Jacob Vosmaer
99916fe159
Add troubleshooting hints to update hook check
2013-10-07 11:27:38 +02:00
Dmitriy Zaporozhets
073c8a2966
Merge pull request #5230 from cmckni3/patch-1
...
Fix invalid json in API docs
2013-10-06 22:44:03 -07:00
Nate Beck
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
Dmitriy Zaporozhets
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
Dmitriy Zaporozhets
Stefano Tortarolo
Steven Thonus
Andrew Kumanyaev
Islam AmerandJacob Vosmaer
Nate Beck