summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix a spec that was assuming to be on the wrong page35599-fix-uncontrolled-default_url_options-overridingRémy Coutable2017-07-281-6/+4
* Ensure Gitlab::Application.routes.default_url_options are set correctly in Ca...Rémy Coutable2017-07-286-15/+13
* Merge branch 'remove-default-access-levels' into 'master'Rémy Coutable2017-07-282-15/+71
|\
| * Make access level more compatible with EELin Jen-Shin2017-07-282-15/+71
* | Merge branch '35691-images-in-wiki-display-have-wrong-size' into 'master'Filipa Lacerda2017-07-281-3/+3
|\ \
| * | none is not a CSS Value for sizes ;-)Tim Zallmann2017-07-281-3/+3
* | | Update CHANGELOG.md for 9.4.2James Edwards-Jones2017-07-2812-45/+15
* | | Merge branch 'help-page-breadcrumb-title-fix' into 'master'Filipa Lacerda2017-07-282-0/+5
|\ \ \
| * | | Fixed the breadcrumb title for help pageshelp-page-breadcrumb-title-fixPhil Hughes2017-07-282-0/+5
| | |/ | |/|
* | | Merge branch 'ph-inline-js' into 'master'Tim Zallmann2017-07-2823-112/+135
|\ \ \
| * | | fixed form action not submitting the correct URLph-inline-jsPhil Hughes2017-07-281-1/+6
| * | | Merge branch 'master' into ph-inline-jsPhil Hughes2017-07-28971-1908/+4062
| |\ \ \
| * \ \ \ Merge branch 'master' into ph-inline-jsPhil Hughes2017-07-27243-1206/+4245
| |\ \ \ \
| * | | | | fixed label subscription & merge conflictsPhil Hughes2017-07-263-3/+14
| * | | | | moved some more inline codePhil Hughes2017-07-256-15/+20
| * | | | | moved some code into new filesPhil Hughes2017-07-256-41/+52
| * | | | | Removed inline JS in shared HAML filesPhil Hughes2017-07-2516-101/+90
* | | | | | Merge branch 'feature/sm/35282-ci_pipeline_variables-2' into 'master'Kamil Trzciński2017-07-2817-27/+249
|\ \ \ \ \ \
| * | | | | | Expand pipeline_trigger_service_spec by godfat requestfeature/sm/35282-ci_pipeline_variables-2Shinya Maeda2017-07-281-16/+28
| * | | | | | Fix revert missShinya Maeda2017-07-281-1/+1
| * | | | | | Fix static snalysysShinya Maeda2017-07-281-1/+1
| * | | | | | Revert "Move validate to begin/rescue block"Shinya Maeda2017-07-281-25/+14
| * | | | | | Use let(:params) instead of def paramShinya Maeda2017-07-281-9/+10
| * | | | | | Use let(:pipeline) for variables spec in triggers_spec.rbShinya Maeda2017-07-281-2/+1
| * | | | | | Remove is_a?(Hash) from unless params[:variables] in create_pipeline_variablesShinya Maeda2017-07-281-1/+1
| * | | | | | Use bang for trigger.trigger_requests.createShinya Maeda2017-07-281-1/+1
| * | | | | | Remove if pipeline.variables in Ci::Build#variablesShinya Maeda2017-07-281-1/+1
| * | | | | | Fix pipelineShinya Maeda2017-07-282-21/+18
| * | | | | | Move validate to begin/rescue blockShinya Maeda2017-07-281-14/+19
| * | | | | | fix merge missShinya Maeda2017-07-282-1/+5
| * | | | | | initShinya Maeda2017-07-2817-32/+247
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'rs-empty_project-features' into 'master'Rémy Coutable2017-07-28148-213/+217
|\ \ \ \ \ \
| * | | | | | Use `empty_project` where possible in spec/features/securityrs-empty_project-featuresRobert Speicher2017-07-276-6/+9
| * | | | | | Use `empty_project` where possible in spec/features/merge_requestsRobert Speicher2017-07-2729-42/+42
| * | | | | | Use `empty_project` where possible in spec/features/issuesRobert Speicher2017-07-2718-30/+30
| * | | | | | Use `empty_project` where possible in spec/features/projectsRobert Speicher2017-07-2773-97/+95
| * | | | | | Use `empty_project` where possible in spec/features/issuablesRobert Speicher2017-07-272-3/+3
| * | | | | | Use `empty_project` where possible in spec/features/atomRobert Speicher2017-07-274-5/+5
| * | | | | | Use `empty_project` where possible in spec/features/profilesRobert Speicher2017-07-271-3/+3
| * | | | | | Use `empty_project` where possible in spec/features/exploreRobert Speicher2017-07-271-1/+1
| * | | | | | Use `empty_project` where possible in spec/features/groupsRobert Speicher2017-07-273-5/+5
| * | | | | | Use `empty_project` where possible in spec/features/adminRobert Speicher2017-07-274-11/+14
| * | | | | | Use `empty_project` where possible in spec/features/dashboardRobert Speicher2017-07-277-10/+10
* | | | | | | Merge branch 'zj-delete-mm-team' into 'master'Douwe Maan2017-07-286-0/+42
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Remove Mattermost team with GitLab groupZ.J. van de Weg2017-07-286-0/+42
* | | | | | | Merge branch '34921-global-dropdown-ui-improvement' into 'master'35691-images-in-wiki-display-have-wrong-sizePhil Hughes2017-07-284-8/+12
|\ \ \ \ \ \ \
| * | | | | | | Global nav (9.0) UI improvementTakuya Noguchi2017-07-284-8/+12
|/ / / / / / /
* | | | | | | Merge branch 'gitaly-ruby-bundler' into 'master'Sean McGivern2017-07-282-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Support the fact that Gitaly uses bundlerJacob Vosmaer2017-07-272-2/+2
* | | | | | | | Merge branch 'backport-refator-git-push-service-spec' into 'master'Douwe Maan2017-07-281-100/+99
|\ \ \ \ \ \ \ \
View Lorry Controller Status