summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-always-verify-source-branch-can-be-deleted' into 'master'Sean McGivern2017-07-041-2/+6
|\
| * Prevent accidental deletion of protected MR source branch by repeating checks...dm-always-verify-source-branch-can-be-deletedDouwe Maan2017-07-041-2/+6
* | Merge branch 'revert-2c879643' into 'master'Sean McGivern2017-07-043-4/+27
|\ \
| * | Revert "Merge branch 'revert-12499' into 'master'"revert-2c879643Douwe Maan2017-07-043-4/+27
* | | Merge branch 'feature/no-hypen-at-end-of-commit-ref-slug' into 'master'Rémy Coutable2017-07-041-2/+5
|\ \ \
| * | | chaining the methods in ref_slugStefan Hanreich2017-06-241-3/+4
| * | | using bang method for gsubStefan Hanreich2017-06-181-2/+2
| * | | updated regex to use beginning / ending of string metacharactersStefan Hanreich2017-06-181-1/+1
| * | | no trailing / leading hyphens in CI_COMMIT_REF_SLUG. Fixes #32035Stefan Hanreich2017-06-181-1/+3
* | | | Merge branch 'enable-new-navigation-option-in-preferences' into 'master'Filipa Lacerda2017-07-043-26/+18
|\ \ \ \ | |_|/ / |/| | |
| * | | Enables the option in user preferences to turn on the new navigationenable-new-navigation-option-in-preferencesPhil Hughes2017-07-043-26/+18
* | | | Remove group modal like remove project modal. Closes #33130Diego Souza2017-07-042-6/+14
* | | | Merge branch 'zj-i18n-pipeline-charts' into 'master'Douwe Maan2017-07-044-17/+17
|\ \ \ \
| * | | | Strings ready for translation; Pipeline chartszj-i18n-pipeline-chartsZ.J. van de Weg2017-07-034-17/+17
* | | | | Merge branch 'tc-namespace-license-checks--multiple-assignees' into 'master'Douwe Maan2017-07-0410-37/+101
|\ \ \ \ \
| * | | | | Ensure /reassign does not assign multiple usersToon Claes2017-06-201-5/+14
| * | | | | Make MergeRequest respond to assignee_ids & assignee_ids=Toon Claes2017-06-203-23/+22
| * | | | | Backport /reassign quick commandToon Claes2017-06-201-0/+18
| * | | | | Backport issuable for assignee slash commands from EEToon Claes2017-06-202-8/+42
| * | | | | Use helper method to set filtered search input attributesToon Claes2017-06-202-1/+13
| * | | | | Use FormHelper#issue_assignees_dropdown_options for Issue sidebarToon Claes2017-06-202-6/+8
| * | | | | [noop] Remove unused codeToon Claes2017-06-201-2/+0
| * | | | | FormHelper#issue_assignees_dropdown_options never has multiple assigneesToon Claes2017-06-202-13/+5
* | | | | | Merge branch '34141-allow-unauthenticated-access-to-the-users-api' into 'master'Rémy Coutable2017-07-044-11/+21
|\ \ \ \ \ \
| * | | | | | Implement review comments for !12445 from @jneen.34141-allow-unauthenticated-access-to-the-users-apiTimothy Andrew2017-07-031-1/+0
| * | | | | | Merge remote-tracking branch 'origin/master' into 34141-allow-unauthenticated...Timothy Andrew2017-06-30283-3029/+4988
| |\ \ \ \ \ \
| * | | | | | | Implement review comments for !12445 from @godfat and @rymai.Timothy Andrew2017-06-304-14/+12
| * | | | | | | Allow unauthenticated access to the `/api/v4/users` API.Timothy Andrew2017-06-261-2/+5
* | | | | | | | Merge branch 'fix-pending-delete-forks' into 'master'Sean McGivern2017-07-041-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Don't resolve fork relationships for projects pending deleteNick Thomas2017-07-041-2/+2
* | | | | | | | Merge branch 'tc-no-delete-protected-merged-branches' into 'master'Rémy Coutable2017-07-041-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | DeleteMergedBranchesService should not delete protected branchesToon Claes2017-07-041-0/+2
* | | | | | | | Merge branch 'hb-hide-archived-labels-from-group-issue-tracker' into 'master'Sean McGivern2017-07-041-1/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Hide archived project labels from group issue trackerHoracio Bertorello2017-06-301-1/+6
* | | | | | | | Merge branch 'monitoring-dashboard-fix-y-label' into 'master'bjk/pipeline_metricPhil Hughes2017-07-041-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed the y_label not setting correctly for each graph on the monitoring dash...monitoring-dashboard-fix-y-labelJose Ivan Vargas2017-07-031-1/+1
* | | | | | | | | Make autosize fields more performant and remove broken autosize handleBryce Johnson2017-07-031-19/+4
* | | | | | | | | Merge branch 'sh-allow-force-repo-create' into 'master'Sean McGivern2017-07-031-10/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change the force flag to a keyword argumentsh-allow-force-repo-createDouglas Barbosa Alexandre2017-07-031-2/+2
| * | | | | | | | | Make Project#ensure_repository force create a repoStan Hu2017-06-301-10/+10
* | | | | | | | | | Merge branch 'add-ci_variables-environment_scope' into 'master'Kamil Trzciński2017-07-031-1/+1
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into add-ci_variables-environm...add-ci_variables-environment_scopeLin Jen-Shin2017-07-0488-524/+896
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into add-ci_variables-environm...Lin Jen-Shin2017-06-29187-2529/+3724
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into add-ci_variables-environm...Lin Jen-Shin2017-06-27159-2413/+3486
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add environment_scope column to ci_variables tableLin Jen-Shin2017-06-211-1/+1
* | | | | | | | | | | | | | Merge branch '32885-unintentionally-removing-branch-when-merging-merge-reques...Grzegorz Bizon2017-07-031-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Set force_remove_source_branch default to false.32885-unintentionally-removing-branch-when-merging-merge-requestBryce Johnson2017-07-021-2/+1
* | | | | | | | | | | | | | | Merge branch '32048-shared-runners-admin-buttons-have-odd-spacing' into 'master'Clement Ho2017-07-032-7/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Replace existing runner links with icons and tooltips, move into btn-group.32048-shared-runners-admin-buttons-have-odd-spacingBryce Johnson2017-07-032-7/+27
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fix-2801' into 'master'Sean McGivern2017-07-033-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \