Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6061 from zzet/patch-8 | Dmitriy Zaporozhets | 2014-01-16 | 1 | -1/+6 |
|\ | |||||
| * | Fix deprecation in specs | Andrew Kumanyaev | 2014-01-15 | 1 | -1/+6 |
* | | Merge pull request #6062 from skv-headless/fix_n+1_user_page | Dmitriy Zaporozhets | 2014-01-16 | 1 | -1/+1 |
|\ \ | |||||
| * | | fix n+1 problem for namespaces | skv | 2014-01-15 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'custom_password_length' into 'master' | Dmitriy Zaporozhets | 2014-01-16 | 2 | -0/+16 |
|\ \ | |||||
| * | | Explain where the default password validation is | Jacob Vosmaer | 2014-01-13 | 1 | -1/+2 |
| * | | Add instructions for custom password length limits | Jacob Vosmaer | 2014-01-13 | 2 | -0/+15 |
* | | | Merge branch 'new-branch-usability' into 'master' | Dmitriy Zaporozhets | 2014-01-16 | 1 | -3/+2 |
|\ \ \ | |||||
| * | | | New branch doesn't exist yet. | dosire | 2014-01-16 | 1 | -2/+2 |
| * | | | Replace hints with text that is obviously not valid. | dosire | 2014-01-15 | 1 | -3/+2 |
* | | | | Merge branch 'refactoring/issues_filter' into 'master' | Dmitriy Zaporozhets | 2014-01-16 | 13 | -248/+183 |
|\ \ \ \ | |||||
| * | | | | FilteringService works with scope :all event if current user is not defined | Dmitriy Zaporozhets | 2014-01-16 | 1 | -1/+5 |
| * | | | | Remove unnecessary spec | Dmitriy Zaporozhets | 2014-01-15 | 1 | -73/+0 |
| * | | | | Remove unnecessary contexts | Dmitriy Zaporozhets | 2014-01-15 | 4 | -200/+0 |
| * | | | | Use FilteringService for project issuus, mrs | Dmitriy Zaporozhets | 2014-01-15 | 3 | -8/+17 |
| * | | | | Specs for FilteringService | Dmitriy Zaporozhets | 2014-01-15 | 1 | -0/+65 |
| * | | | | Use FilteringService for Dashboard, Group pages | Dmitriy Zaporozhets | 2014-01-15 | 4 | -21/+32 |
| * | | | | Implement FilteringService | Dmitriy Zaporozhets | 2014-01-15 | 1 | -0/+119 |
* | | | | | Merge branch '6-4-update-guide' into 'master' | Dmitriy Zaporozhets | 2014-01-16 | 1 | -4/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Simplify upgrade guide based on 6-4 functionality mentioned by Jacob. | dosire | 2014-01-06 | 1 | -4/+2 |
* | | | | | | Merge branch 'webhook_verify_none' into 'master' | Dmitriy Zaporozhets | 2014-01-16 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Disable SSL peer verification for all webhooks | Jacob Vosmaer | 2014-01-15 | 1 | -1/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'say-media-mention' into 'master' | Dmitriy Zaporozhets | 2014-01-16 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add second sponsorship message, perfect world. | dosire | 2014-01-16 | 1 | -2/+2 |
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-01-16 | 2 | -1/+10 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Merge pull request #6065 from jvanbaarsen/github-email-fix | Dmitriy Zaporozhets | 2014-01-16 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Always ask for email with github omniauth | Jeroen van Baarsen | 2014-01-15 | 1 | -1/+2 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #6048 from jvanbaarsen/patch-2 | Sytse Sijbrandij | 2014-01-16 | 1 | -0/+8 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Added webbrowser requirements | Jeroen van Baarsen | 2014-01-15 | 1 | -0/+8 |
* | | | | | | | Merge branch 'refactoring/services' of /home/git/repositories/gitlab/gitlabhq | Dmitriy Zaporozhets | 2014-01-15 | 11 | -74/+71 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Test hook properly | Dmitriy Zaporozhets | 2014-01-15 | 1 | -2/+4 |
| * | | | | | | Fix commit page | Dmitriy Zaporozhets | 2014-01-15 | 1 | -1/+1 |
| * | | | | | | Remove commit_load_context.rb | Dmitriy Zaporozhets | 2014-01-15 | 3 | -52/+23 |
| * | | | | | | Convert TestHookContext into TestHookService. Added tests | Dmitriy Zaporozhets | 2014-01-15 | 4 | -10/+28 |
| * | | | | | | Use instance methods for system_hooks_service | Dmitriy Zaporozhets | 2014-01-15 | 3 | -9/+15 |
* | | | | | | | Merge branch 'improve/notification' of /home/git/repositories/gitlab/gitlabhq | Dmitriy Zaporozhets | 2014-01-15 | 3 | -3/+35 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Move repo rename email to notification service | Dmitriy Zaporozhets | 2014-01-15 | 3 | -3/+35 |
|/ / / / / / | |||||
* | | | | | | Customize merge commit message in CHANGELOG | Dmitriy Zaporozhets | 2014-01-15 | 1 | -1/+2 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge branch 'feature/merge_commit_message' of /home/git/repositories/gitlab/... | Dmitriy Zaporozhets | 2014-01-15 | 9 | -66/+102 |
|\ \ \ \ \ | |||||
| * | | | | | Dont allow merge without commit message | Dmitriy Zaporozhets | 2014-01-14 | 1 | -0/+2 |
| * | | | | | Tests for accept MR with custom message | Dmitriy Zaporozhets | 2014-01-14 | 3 | -25/+58 |
| * | | | | | Fix mr controller specs | Dmitriy Zaporozhets | 2014-01-14 | 2 | -6/+7 |
| * | | | | | Add UI for custom Merge request commit message | Dmitriy Zaporozhets | 2014-01-13 | 1 | -1/+15 |
| * | | | | | Use params[:merge_commit_message] in MergeRequestController for automerge | Dmitriy Zaporozhets | 2014-01-13 | 1 | -1/+1 |
| * | | | | | MergeRequest#automerge accepts custom message now. MergeRequest#merge_commit_... | Dmitriy Zaporozhets | 2014-01-13 | 1 | -2/+10 |
| * | | | | | Add merge_commit_message argument for Satellite::MergeAction#merge | Dmitriy Zaporozhets | 2014-01-13 | 1 | -9/+4 |
| * | | | | | Use same code for diff and patch inside MergeAction | Dmitriy Zaporozhets | 2014-01-13 | 2 | -19/+5 |
| * | | | | | Add support of custom message to merge action of satellite | Dmitriy Zaporozhets | 2014-01-13 | 1 | -15/+12 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #6050 from jvanbaarsen/regex-fix | Dmitriy Zaporozhets | 2014-01-14 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Allow . files to be created | Jeroen van Baarsen | 2014-01-14 | 1 | -2/+2 |
| | |/ / / | |/| | | |