summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Improve & fix the performance bar UI and behaviorRémy Coutable2017-07-065-11/+20
* 34727 Remove two columned layout from project member settingstauriedavis2017-07-061-3/+2
* Merge branch 'repo-limited-width' into 'master'Filipa Lacerda2017-07-061-3/+2
|\
| * Limit the file tree view container widthrepo-limited-widthPhil Hughes2017-07-051-3/+2
* | Merge branch 'backport_slack_application_changes' into 'master'Sean McGivern2017-07-062-14/+16
|\ \
| * | Backport Service changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_r...backport_slack_application_changesValery Sizov2017-07-052-14/+16
* | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Douwe Maan2017-07-061-1/+4
|\ \ \
| * | | Implement review comments for !11963 from @adamniedzielski.Timothy Andrew2017-07-061-1/+1
| * | | Move OAuth "remember me" javascript logic into a class.Timothy Andrew2017-07-061-14/+0
| * | | Add integration tests around OAuth login.Timothy Andrew2017-07-061-1/+1
| * | | Implement "remember me" for OAuth-based login.Timothy Andrew2017-07-061-1/+18
* | | | Merge branch 'additional-commits-integer-fix' into 'master'Sean McGivern2017-07-061-1/+1
|\ \ \ \
| * | | | Fix invalid integer value when more than 1000 commitsadditional-commits-integer-fixPhil Hughes2017-07-051-1/+1
* | | | | Merge branch '32815--Add-Custom-CI-Config-Path' into 'master'Grzegorz Bizon2017-07-061-0/+8
|\ \ \ \ \
| * \ \ \ \ Merge commit 'a8a4ca17e444c761ed9fc5dca4542cfec79abe55' into 32815--Add-Custo...32815--Add-Custom-CI-Config-PathGrzegorz Bizon2017-07-052-165/+162
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-07-0520-75/+87
| |\ \ \ \ \ \
| * | | | | | | Rename ci_config_file to ci_config_pathLin Jen-Shin2017-07-051-3/+3
| * | | | | | | Fix various descriptions given the feedbackLin Jen-Shin2017-07-041-1/+1
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-07-0320-32/+74
| |\ \ \ \ \ \ \
| * | | | | | | | Update wordings, allow only full path, add testsLin Jen-Shin2017-06-301-3/+3
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-06-3060-339/+850
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix doc, test, and formLin Jen-Shin2017-06-282-87/+8
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into 15041-Add-Custom-CI-Confi...15041-Add-Custom-CI-Config-PathLin Jen-Shin2017-06-28982-7897/+12465
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add config option to project to allow custom .gitlab-ci.yml locationKeith Pope2016-10-081-0/+7
* | | | | | | | | | | Merge branch '32408-enable-disable-all-restricted-visibility-levels' into 'ma...Douwe Maan2017-07-051-1/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Allow admin to disable all restricted visibility levels32408-enable-disable-all-restricted-visibility-levelsTiago Botelho2017-07-051-1/+3
* | | | | | | | | | | | Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-05227-497/+494
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
* | | | | | | | | | | Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'"revert-6df61942Sean McGivern2017-07-051-4/+1
* | | | | | | | | | | Merge branch '32838-admin-panel-spacing' into 'master'Annabel Dunstone Gray2017-07-051-161/+161
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | 32838 Add wells to admin dashboard overview to fix spacing problems32838-admin-panel-spacingtauriedavis2017-06-281-161/+161
* | | | | | | | | | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Sean McGivern2017-07-051-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Implement review comments for !11963 from @adamniedzielski.Timothy Andrew2017-07-031-1/+1
| * | | | | | | | | | Move OAuth "remember me" javascript logic into a class.Timothy Andrew2017-07-031-14/+0
| * | | | | | | | | | Add integration tests around OAuth login.Timothy Andrew2017-07-031-1/+1
| * | | | | | | | | | Implement "remember me" for OAuth-based login.Timothy Andrew2017-07-031-1/+18
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | 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
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Revert change to design. Go back to scrollable pageFilipa Lacerda2017-07-051-4/+7
|/ / / / / / / / /
* | | | | | | | | Merge branch 'monitoring-dashboard-fine-tuning-ux' into 'master'Phil Hughes2017-07-051-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Improve the overall UX for the new monitoring dashboardmonitoring-dashboard-fine-tuning-uxJose Ivan Vargas2017-07-041-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'enable-new-navigation-option-in-preferences' into 'master'Filipa Lacerda2017-07-042-22/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Enables the option in user preferences to turn on the new navigationenable-new-navigation-option-in-preferencesPhil Hughes2017-07-042-22/+18
* | | | | | | | | Remove group modal like remove project modal. Closes #33130Diego Souza2017-07-041-6/+9
* | | | | | | | | 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-044-8/+10
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Use helper method to set filtered search input attributesToon Claes2017-06-201-1/+1
| * | | | | | | | | Use FormHelper#issue_assignees_dropdown_options for Issue sidebarToon Claes2017-06-202-6/+8
| * | | | | | | | | FormHelper#issue_assignees_dropdown_options never has multiple assigneesToon Claes2017-06-201-1/+1
* | | | | | | | | | Merge branch '32885-unintentionally-removing-branch-when-merging-merge-reques...Grzegorz Bizon2017-07-031-2/+1
|\ \ \ \ \ \ \ \ \ \