summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6061 from zzet/patch-8Dmitriy Zaporozhets2014-01-161-1/+6
|\
| * Fix deprecation in specsAndrew Kumanyaev2014-01-151-1/+6
* | Merge pull request #6062 from skv-headless/fix_n+1_user_pageDmitriy Zaporozhets2014-01-161-1/+1
|\ \
| * | fix n+1 problem for namespacesskv2014-01-151-1/+1
| |/
* | Merge branch 'custom_password_length' into 'master'Dmitriy Zaporozhets2014-01-162-0/+16
|\ \
| * | Explain where the default password validation isJacob Vosmaer2014-01-131-1/+2
| * | Add instructions for custom password length limitsJacob Vosmaer2014-01-132-0/+15
* | | Merge branch 'new-branch-usability' into 'master'Dmitriy Zaporozhets2014-01-161-3/+2
|\ \ \
| * | | New branch doesn't exist yet.dosire2014-01-161-2/+2
| * | | Replace hints with text that is obviously not valid.dosire2014-01-151-3/+2
* | | | Merge branch 'refactoring/issues_filter' into 'master'Dmitriy Zaporozhets2014-01-1613-248/+183
|\ \ \ \
| * | | | FilteringService works with scope :all event if current user is not definedDmitriy Zaporozhets2014-01-161-1/+5
| * | | | Remove unnecessary specDmitriy Zaporozhets2014-01-151-73/+0
| * | | | Remove unnecessary contextsDmitriy Zaporozhets2014-01-154-200/+0
| * | | | Use FilteringService for project issuus, mrsDmitriy Zaporozhets2014-01-153-8/+17
| * | | | Specs for FilteringServiceDmitriy Zaporozhets2014-01-151-0/+65
| * | | | Use FilteringService for Dashboard, Group pagesDmitriy Zaporozhets2014-01-154-21/+32
| * | | | Implement FilteringServiceDmitriy Zaporozhets2014-01-151-0/+119
* | | | | Merge branch '6-4-update-guide' into 'master'Dmitriy Zaporozhets2014-01-161-4/+2
|\ \ \ \ \
| * | | | | Simplify upgrade guide based on 6-4 functionality mentioned by Jacob.dosire2014-01-061-4/+2
* | | | | | Merge branch 'webhook_verify_none' into 'master'Dmitriy Zaporozhets2014-01-161-1/+2
|\ \ \ \ \ \
| * | | | | | Disable SSL peer verification for all webhooksJacob Vosmaer2014-01-151-1/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'say-media-mention' into 'master'Dmitriy Zaporozhets2014-01-161-2/+2
|\ \ \ \ \ \
| * | | | | | Add second sponsorship message, perfect world.dosire2014-01-161-2/+2
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-01-162-1/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge pull request #6065 from jvanbaarsen/github-email-fixDmitriy Zaporozhets2014-01-161-1/+2
| |\ \ \ \ \ \
| | * | | | | | Always ask for email with github omniauthJeroen van Baarsen2014-01-151-1/+2
| | |/ / / / /
| * | | | | | Merge pull request #6048 from jvanbaarsen/patch-2Sytse Sijbrandij2014-01-161-0/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Added webbrowser requirementsJeroen van Baarsen2014-01-151-0/+8
* | | | | | | Merge branch 'refactoring/services' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2014-01-1511-74/+71
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Test hook properlyDmitriy Zaporozhets2014-01-151-2/+4
| * | | | | | Fix commit pageDmitriy Zaporozhets2014-01-151-1/+1
| * | | | | | Remove commit_load_context.rbDmitriy Zaporozhets2014-01-153-52/+23
| * | | | | | Convert TestHookContext into TestHookService. Added testsDmitriy Zaporozhets2014-01-154-10/+28
| * | | | | | Use instance methods for system_hooks_serviceDmitriy Zaporozhets2014-01-153-9/+15
* | | | | | | Merge branch 'improve/notification' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2014-01-153-3/+35
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Move repo rename email to notification serviceDmitriy Zaporozhets2014-01-153-3/+35
|/ / / / / /
* | | | | | Customize merge commit message in CHANGELOGDmitriy Zaporozhets2014-01-151-1/+2
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'feature/merge_commit_message' of /home/git/repositories/gitlab/...Dmitriy Zaporozhets2014-01-159-66/+102
|\ \ \ \ \
| * | | | | Dont allow merge without commit messageDmitriy Zaporozhets2014-01-141-0/+2
| * | | | | Tests for accept MR with custom messageDmitriy Zaporozhets2014-01-143-25/+58
| * | | | | Fix mr controller specsDmitriy Zaporozhets2014-01-142-6/+7
| * | | | | Add UI for custom Merge request commit messageDmitriy Zaporozhets2014-01-131-1/+15
| * | | | | Use params[:merge_commit_message] in MergeRequestController for automergeDmitriy Zaporozhets2014-01-131-1/+1
| * | | | | MergeRequest#automerge accepts custom message now. MergeRequest#merge_commit_...Dmitriy Zaporozhets2014-01-131-2/+10
| * | | | | Add merge_commit_message argument for Satellite::MergeAction#mergeDmitriy Zaporozhets2014-01-131-9/+4
| * | | | | Use same code for diff and patch inside MergeActionDmitriy Zaporozhets2014-01-132-19/+5
| * | | | | Add support of custom message to merge action of satelliteDmitriy Zaporozhets2014-01-131-15/+12
| | |_|_|/ | |/| | |
* | | | | Merge pull request #6050 from jvanbaarsen/regex-fixDmitriy Zaporozhets2014-01-141-2/+2
|\ \ \ \ \
| * | | | | Allow . files to be createdJeroen van Baarsen2014-01-141-2/+2
| | |/ / / | |/| | |