summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed jobs page not being in new admin sidebarnew-admin-sidebar-jobs-fixPhil Hughes2017-07-071-2/+2
* Merge branch 'fix-sha-attribute-no-table' into 'master'Yorick Peterse2017-07-072-6/+27
|\
| * Fix ShaAttribute concern when there is no tablefix-sha-attribute-no-tableSean McGivern2017-07-072-6/+27
* | Merge branch 'feature/intermediate/12729-group-secret-variables' into 'master'Kamil Trzciński2017-07-0741-61/+760
|\ \
| * | Name as variable_params like project variable controllerShinya Maeda2017-07-071-6/+10
| * | Use variable_params && variable_params_attributes in project variables_contro...Shinya Maeda2017-07-071-4/+8
| * | Fix to Variable was successfully createdShinya Maeda2017-07-071-3/+3
| * | Use new project_variables_path in this MRShinya Maeda2017-07-073-9/+9
| * | gb nice catchesShinya Maeda2017-07-074-12/+12
| * | Adopt project_variable_path instead of namespace_project_variable_path. (Reso...Shinya Maeda2017-07-072-4/+4
| * | secret_variables_for: rails readability versinoShinya Maeda2017-07-071-11/+5
| * | Add CASE When Clause for saving order when using where INShinya Maeda2017-07-072-6/+21
| * | Use ancestors for avoiding N queriesShinya Maeda2017-07-071-4/+3
| * | ayufan nice catchesShinya Maeda2017-07-072-14/+22
| * | Fix variables_controller.rb and formatShinya Maeda2017-07-072-8/+9
| * | Add dash for GROUP_ROUTESShinya Maeda2017-07-071-0/+1
| * | Wrap additional routes by dash(-). And remove those routes from path_regex.rb.Shinya Maeda2017-07-072-6/+6
| * | Copyedit docs for group-level secret variablesAchilleas Pipinellis2017-07-071-24/+16
| * | Basic BE changeShinya Maeda2017-07-0741-52/+733
* | | Merge branch 'gitaly-mandatory' into 'master'Sean McGivern2017-07-0711-74/+45
|\ \ \
| * | | Remove option to disable Gitaly completelyJacob Vosmaer2017-07-0711-74/+40
| * | | Configure token on client side tooJacob Vosmaer2017-07-061-0/+5
* | | | Merge branch '9-4-pre' into 'master'James Edwards-Jones2017-07-071-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update VERSION to 9.4.0-pre.9-4-preMarin Jankovski2017-07-071-1/+1
* | | | Merge branch '34153-extend-mr-tabs' into 'master'Phil Hughes2017-07-071-2/+8
|\ \ \ \
| * | | | Extend MR tabs a bit to cover up the avatar holder and collapse icon on scrollAnnabel Dunstone Gray2017-07-071-2/+8
|/ / / /
* | | | Merge branch 'dm-readme-auxiliary-blob-viewer-without-wiki' into 'master'Sean McGivern2017-07-075-1/+64
|\ \ \ \ | |/ / / |/| | |
| * | | Don't show auxiliary blob viewer for README when there is no wikidm-readme-auxiliary-blob-viewer-without-wikiDouwe Maan2017-07-065-1/+64
* | | | Merge branch 'pages-0-5-0' into 'master'Grzegorz Bizon2017-07-071-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Upgrade GitLab Pages to v0.5.0Nick Thomas2017-07-041-1/+1
* | | | Merge branch '33748-fix-n-plus-1-query-in-the-projects-api' into 'master'Robert Speicher2017-07-074-4/+61
|\ \ \ \
| * | | | Add CHANGELOGRémy Coutable2017-07-071-0/+4
| * | | | Fix some N+1 queries in the GET /projects APIRémy Coutable2017-07-073-4/+57
* | | | | Merge branch 'fix-routes-in-production-mode' into 'master'Douwe Maan2017-07-061-1/+5
|\ \ \ \ \
| * | | | | Fix shorter route helpers in production environmentfix-routes-in-production-modeSean McGivern2017-07-061-1/+5
* | | | | | Merge branch 'workhorse-2-3-0' into 'master'Robert Speicher2017-07-062-1/+5
|\ \ \ \ \ \
| * | | | | | Upgrade GitLab Workhorse to v2.3.0Nick Thomas2017-07-062-1/+5
| |/ / / / /
* | | | | | Merge branch 'remove-orphans' into 'master'34759-rogueJacob Schatz2017-07-062-42/+0
|\ \ \ \ \ \
| * | | | | | Remove orphaned haml filesremove-orphansClement Ho2017-07-062-42/+0
* | | | | | | Merge branch '33910-improve-perf-bar-ui-and-behavior' into 'master'Clement Ho2017-07-0617-52/+171
|\ \ \ \ \ \ \
| * | | | | | | Improve & fix the performance bar UI and behaviorRémy Coutable2017-07-0617-52/+171
|/ / / / / / /
* | | | | | | Merge branch 'acet-fix-tooltip-placement' into 'master'Jacob Schatz2017-07-061-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Banzai: Add tooltip attributes to reference filter.acet-fix-tooltip-placementFatih Acet2017-07-031-0/+2
* | | | | | | Merge branch 'merge-request-commits-table' into 'master'Douwe Maan2017-07-0621-123/+222
|\ \ \ \ \ \ \
| * | | | | | | Add table for merge request commitsSean McGivern2017-07-0621-123/+222
* | | | | | | | Merge branch '34702-draw-legacy-builds' into 'master'Douwe Maan2017-07-063-38/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Just draw :legacy_builds34702-draw-legacy-buildsLin Jen-Shin2017-07-063-38/+23
* | | | | | | | | Merge branch '34727-simplified-member-settings' into 'master'Clement Ho2017-07-062-3/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 34727 Remove two columned layout from project member settingstauriedavis2017-07-062-3/+6
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Fixed CHANGELOG.md for 9.3.4 releaseJames Edwards-Jones2017-07-061-1/+1
View Lorry Controller Status