summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sshkey-ux' into 'master' Rémy Coutable2016-07-111-1/+1
|\
| * Add reminder to not paste private SSH keysIngo Blechschmidt2016-07-091-1/+1
* | Merge branch 'compare-avatar-alignment' into 'master' Robert Speicher2016-07-101-0/+6
|\ \ | |/ |/|
| * Fixed commit avatar alignment in compare viewcompare-avatar-alignmentPhil Hughes2016-07-071-0/+6
* | Make subnavigation a bit darker colorDmitriy Zaporozhets2016-07-092-9/+7
* | Use btn-danger for delete button.Connor Shea2016-07-081-1/+1
* | Update New Snippet buttons.Connor Shea2016-07-084-43/+45
* | Merge branch 'cs-cropper' into 'master' Fatih Acet2016-07-0817-4/+24
|\ \
| * | Fix preferences tests.cs-cropperConnor Shea2016-06-3010-3/+12
| * | Add a helper function for getting the page path from JS.Connor Shea2016-06-292-3/+6
| * | Split Cropper.js from the main JavaScript manifest.Connor Shea2016-06-297-2/+10
* | | Merge branch 'improve-project-limit-field' into 'master' Rémy Coutable2016-07-081-1/+1
|\ \ \
| * | | Add min attribute to project_limit field on user's formAndrey Krivko2016-07-081-1/+1
* | | | Merge branch 'rubocop/enable-identical-conditional-branches-cop' into 'master' Robert Speicher2016-07-083-19/+6
|\ \ \ \
| * | | | Remove legacy conditional from irker service coderubocop/enable-identical-conditional-branches-copGrzegorz Bizon2016-07-081-8/+0
| * | | | Enable Style/IdenticalConditionalBranches Rubocop copGrzegorz Bizon2016-07-083-12/+7
* | | | | Merge branch 'retrieve-mr-closes-issues-just-when-required' into 'master' Rémy Coutable2016-07-083-9/+7
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Avoid calculation of closes_issues.retrieve-mr-closes-issues-just-when-requiredPaco Guzman2016-07-073-9/+7
| | |_|/ | |/| |
* | | | Merge branch 'yatish27/gitlab-ce-project-commit-range-comment' into 'master' Rémy Coutable2016-07-081-2/+2
|\ \ \ \
| * | | | Fix comment for project argument in commit_range.rbYatish Mehta2016-06-201-2/+2
* | | | | Merge branch 'dont-render-discussion-notes-on-not-html-requests'Douwe Maan2016-07-082-24/+34
|\ \ \ \ \
| * | | | | Don't render discussion notes when requesting diff tab through AJAXdont-render-discussion-notes-on-not-html-requestsPaco Guzman2016-07-082-24/+34
* | | | | | Memoize MR merged/closed events retrievalmemoize_merge_request_eventsPaco Guzman2016-07-081-2/+2
| |_|_|/ / |/| | | |
* | | | | Merge branch 'feature/option-set-new-users-external' into 'master' Rémy Coutable2016-07-084-1/+10
|\ \ \ \ \
| * | | | | Added setting to set new users by default as externalDravere2016-07-074-1/+10
* | | | | | Merge branch '9127-link-report-to-profile' into 'master' Robert Speicher2016-07-082-2/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Removed unnecessary `id` from links and corrected tests to use the proper mat...9127-link-report-to-profilePatricio Cano2016-07-072-2/+2
| * | | | | Added specs to check for the correct links.Patricio Cano2016-07-062-2/+2
| * | | | | Link to the user's profile in the abuse reports and add a link to the admin a...Patricio Cano2016-07-062-2/+7
* | | | | | Revert "Revert "Merge branch 'issue_3946' into 'master' ""Robert Speicher2016-07-0717-289/+388
* | | | | | Merge branch 'prefer-scope' into 'master' Douwe Maan2016-07-071-4/+1
|\ \ \ \ \ \
| * | | | | | Use scope rather than class methodprefer-scopeLin Jen-Shin2016-07-071-4/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'prefer-ref' into 'master' Douwe Maan2016-07-072-4/+4
|\ \ \ \ \ \
| * | | | | | Also use ref in Repository#commitprefer-refLin Jen-Shin2016-07-071-2/+2
| * | | | | | Prefer ref rather than id because id is shadowing database idLin Jen-Shin2016-07-071-2/+2
| |/ / / / /
* | | | | | Merge remote-tracking branch 'origin/master'Robert Speicher2016-07-0712-58/+212
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '18627-wildcard-branch-protection' into 'master' Douwe Maan2016-07-0712-58/+212
| |\ \ \ \ \ \
| | * | | | | | Have `Project#open_branches` return branches that are matched by a wildcard p...18627-wildcard-branch-protectionTimothy Andrew2016-07-072-2/+6
| | * | | | | | Use the `GLDropdown` component to select protected branches.Timothy Andrew2016-07-075-10/+62
| | * | | | | | Add documentation for wildcard protected branches.Timothy Andrew2016-07-051-1/+2
| | * | | | | | Improve the error message displayed when branch creation fails.Timothy Andrew2016-07-051-7/+7
| | * | | | | | Modify the frontend for wildcard protected branches.Timothy Andrew2016-07-058-37/+107
| | * | | | | | Support wildcard matches for protected branches at the model level.Timothy Andrew2016-07-052-13/+40
* | | | | | | | Revert "Merge branch 'issue_3946' into 'master' "Robert Speicher2016-07-0717-388/+289
|/ / / / / / /
* | | | | | | Merge branch '18181-pipeline-duration' into 'master' Robert Speicher2016-07-072-1/+8
|\ \ \ \ \ \ \
| * | | | | | | Change 3600 to 1.hourAnnabel Dunstone2016-07-071-1/+1
| * | | | | | | Update time format of duration18181-pipeline-durationAnnabel Dunstone2016-07-062-1/+8
* | | | | | | | Merge branch 'issues-blank-state' into 'master' Jacob Schatz2016-07-075-32/+60
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed spellingissues-blank-statePhil Hughes2016-07-062-11/+8
| * | | | | | | | Uses any method instead of nil to check for issuesPhil Hughes2016-07-051-1/+1
View Lorry Controller Status