summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '32838-admin-panel-spacing' into 'master'Annabel Dunstone Gray2017-07-052-161/+175
|\
| * 32838 Add wells to admin dashboard overview to fix spacing problems32838-admin-panel-spacingtauriedavis2017-06-282-161/+175
* | Merge branch '33580-fix-api-scoping' into 'master'Douwe Maan2017-07-051-6/+18
|\ \
| * \ Merge branch 'master' into '33580-fix-api-scoping'Douwe Maan2017-07-04240-2736/+4368
| |\ \
| * | | `AccessTokenValidationService` accepts `String` or `API::Scope` scopes.Timothy Andrew2017-06-301-1/+8
| * | | Extract a `Gitlab::Scope` class.Timothy Andrew2017-06-291-9/+8
| * | | Implement review comments from @DouweM for !12300.Timothy Andrew2017-06-281-2/+2
| * | | Fix remaining spec failures for !12300.Timothy Andrew2017-06-281-1/+1
| * | | Allow API scope declarations to be applied conditionally.Timothy Andrew2017-06-281-6/+9
| * | | Initial attempt at refactoring API scope declarations.Timothy Andrew2017-06-281-1/+4
* | | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Sean McGivern2017-07-054-1/+46
|\ \ \ \
| * | | | Fix build for !11963.Timothy Andrew2017-07-031-1/+1
| * | | | Implement review comments for !11963 from @filipa.Timothy Andrew2017-07-032-4/+5
| * | | | Implement review comments for !11963 from @adamniedzielski.Timothy Andrew2017-07-031-1/+1
| * | | | Get ESLint spec passing for the `OAuthRememberMe` class.Timothy Andrew2017-07-031-6/+6
| * | | | Move OAuth "remember me" javascript logic into a class.Timothy Andrew2017-07-033-14/+33
| * | | | Add integration tests around OAuth login.Timothy Andrew2017-07-031-1/+1
| * | | | Implement "remember me" for OAuth-based login.Timothy Andrew2017-07-032-1/+26
* | | | | Merge branch 'new-nav-column-fix' into 'master'Filipa Lacerda2017-07-051-2/+2
|\ \ \ \ \
| * | | | | Fixes the column widths for the new navigation options in settingsPhil Hughes2017-07-051-2/+2
* | | | | | Merge branch 'sh-log-application-controller-exceptions-sentry' into 'master'Rémy Coutable2017-07-051-0/+2
|\ \ \ \ \ \
| * | | | | | Log rescued exceptions to Sentrysh-log-application-controller-exceptions-sentryStan Hu2017-07-041-0/+2
* | | | | | | Revert change to design. Go back to scrollable pageFilipa Lacerda2017-07-054-170/+129
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'monitoring-dashboard-fine-tuning-ux' into 'master'Phil Hughes2017-07-053-10/+22
|\ \ \ \ \ \
| * | | | | | Improve the overall UX for the new monitoring dashboardmonitoring-dashboard-fine-tuning-uxJose Ivan Vargas2017-07-043-10/+22
| | |/ / / / | |/| | | |
* | | | | | 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
View Lorry Controller Status