summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Send devise emails asyncDmitriy Zaporozhets2013-10-094-2/+7
* Remove test case that cause Mysql DeadlockDmitriy Zaporozhets2013-10-091-6/+0
* Merge pull request #5291 from astratto/title_issue_trackersDmitriy Zaporozhets2013-10-094-1/+27
|\
| * Use proper titles for issues trackersStefano Tortarolo2013-10-094-1/+27
* | Improve Profile settings UIDmitriy Zaporozhets2013-10-093-61/+23
* | Merge pull request #5281 from Popl7/upload_avatar_to_gitlabDmitriy Zaporozhets2013-10-0940-39/+119
|\ \
| * | avatar upload on profile pageSteven Thonus2013-10-0940-39/+119
* | | Merge pull request #5278 from ZaaLabs/masterDmitriy Zaporozhets2013-10-081-2/+2
|\ \ \ | |/ / |/| |
| * | Update installation.mdNate Beck2013-10-061-2/+2
* | | Merge pull request #5290 from zzet/patch-3Dmitriy Zaporozhets2013-10-081-1/+5
|\ \ \ | |_|/ |/| |
| * | Update merge requests from fork project to origin projectAndrew Kumanyaev2013-10-081-1/+5
|/ /
* | Merge branch 'feature/system_hook_user_id' of /home/git/repositories/gitlab/g...Dmitriy Zaporozhets2013-10-083-31/+26
|\ \
| * | Mention SystemHook user_id in sample. Extend testsDmitriy Zaporozhets2013-10-082-30/+24
| * | Add user_id to system hook when new user createdDmitriy Zaporozhets2013-10-082-2/+3
* | | Fix system hook page descriptionDmitriy Zaporozhets2013-10-081-6/+9
* | | Merge branch 'mr_votes_api' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-10-082-1/+9
|\ \ \ | |/ / |/| |
| * | Expose votes in merge request apiIslam Amer2013-10-082-1/+9
|/ /
* | Merge branch 'feature/ssh_ldap_check' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-10-082-0/+11
|\ \
| * | Check if LDAP user was removed or blocked when use git over sshDmitriy Zaporozhets2013-10-072-0/+11
* | | Fix merge request model specDmitriy Zaporozhets2013-10-071-2/+2
* | | Fix avatar margin for files viewDmitriy Zaporozhets2013-10-072-6/+1
|/ /
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2013-10-076-11/+11
|\ \
| * | Fix sudo commands in update guidesJacob Vosmaer2013-10-076-11/+11
* | | Merge branch 'sidekiq_stop' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-10-071-2/+2
|\ \ \ | |/ / |/| |
| * | Run stopping commands in the foregroundJacob Vosmaer2013-10-071-2/+2
* | | Fix bugs when discussion visible in wrong projectDmitriy Zaporozhets2013-10-071-1/+5
* | | Merge branch 'feature/api_remove_group' of /home/git/repositories/gitlab/gitl...Dmitriy Zaporozhets2013-10-074-2/+68
|\ \ \
| * | | Mention remove group api in CHANGELOGDmitriy Zaporozhets2013-10-071-0/+1
| * | | Remove group api specsDmitriy Zaporozhets2013-10-071-0/+38
| * | | API: new feature - remove groupDmitriy Zaporozhets2013-10-072-2/+29
* | | | Merge pull request #5158 from tkoenig/fix-active-milestone-orderDmitriy Zaporozhets2013-10-071-1/+1
|\ \ \ \
| * | | | Sort active milestones by due dates (closest first)Thomas König2013-09-231-1/+1
* | | | | Merge branch 'check_hooks' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-10-071-6/+12
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add troubleshooting hints to update hook checkJacob Vosmaer2013-10-071-6/+12
* | | | | Merge pull request #5230 from cmckni3/patch-1Dmitriy Zaporozhets2013-10-062-15/+14
|\ \ \ \ \
| * | | | | Fix json keys in groups API documentationChris McKnight2013-09-301-14/+14
| * | | | | Fix invalid json in issues API docChris McKnight2013-09-301-6/+5
* | | | | | Merge pull request #5216 from bladealslayer/feature/flowdock_integrationDmitriy Zaporozhets2013-10-047-1/+129
|\ \ \ \ \ \
| * | | | | | Use gitlab-flowdock-git-hook patched for dependency on gitlab-grit, instead o...Boyan Tabakov2013-10-033-9/+7
| * | | | | | Added Flowdock integration support via a service.Boyan Tabakov2013-09-297-1/+131
* | | | | | | Merge branch 'satellite_merge' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-10-041-3/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove outdated comments.Marin Jankovski2013-10-041-2/+0
| * | | | | | | Fix failed merge when filename is the same as target branchname.Marin Jankovski2013-10-041-1/+1
* | | | | | | | Merge branch 'improve_sidekiq_check' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-10-041-4/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Only kill sidekiqs belonging to gitlab userJacob Vosmaer2013-10-041-4/+6
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2013-10-041-6/+13
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Merge branch 'requirements-cloud-experience' of /home/git/repositories/gitlab...Dmitriy Zaporozhets2013-10-041-6/+13
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Better requirements based on the experience of GitLab Cloud.Sytse Sijbrandij2013-10-041-6/+13
| |/ / / / / /
* | | | | | | Merge pull request #5262 from yatish27/masterJacob Vosmaer2013-10-031-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Typo:Corrected the typo of sign-in in User ModelYatish Mehta2013-10-031-1/+1
| |/ / / / / /