summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Clarify yaml hidden keys (jobs)docs/yaml-hidden-keysAchilleas Pipinellis2017-09-081-11/+17
|
* Merge branch '37411-update-omniauth-google-oauth2' into 'master'Douwe Maan2017-09-072-4/+4
|\ | | | | | | | | | | | | Update the omniauth-google-oauth2 gem to 0.5.2 Closes #37411 See merge request !14105
| * Update the omniauth-google-oauth2 gem to 0.5.237411-update-omniauth-google-oauth2Rémy Coutable2017-09-072-4/+4
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'update-templates-for-10-0' into 'master'Kamil Trzciński2017-09-0714-22/+572
|\ \ | | | | | | | | | | | | Update templates for 10.0 See merge request !14104
| * | Update templates for 10.0update-templates-for-10-0Alessio Caiazza2017-09-0714-22/+572
| | |
* | | Merge branch 'add-security-on-protected-branches' into 'master'Achilleas Pipinellis2017-09-073-0/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add Security on protected branches Closes #35710 See merge request !14066
| * | | Add Security on protected branchesFabio Busatto2017-09-073-0/+40
|/ / /
* | | Merge branch 'wiki_api' into 'master'Grzegorz Bizon2017-09-078-0/+948
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add API support for wiki pages Closes #12747 See merge request !13372
| * | | Add API support for wiki pagesblackst0ne2017-09-078-0/+948
| | | |
* | | | Merge branch 'docs-37499-add-description-template-examples-to-the-docs' into ↵Achilleas Pipinellis2017-09-072-0/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add description template examples to the docs Closes #37499 See merge request !14073
| * | | | Add full text example description templateMark Fletcher2017-09-061-0/+45
| | | | |
| * | | | Add link to GitLab project examples in Description Template documentationMark Fletcher2017-09-062-0/+14
| | | | |
* | | | | Merge branch 'rs-remove-usage-ping-pretty' into 'master'Sean McGivern2017-09-072-3/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the `pretty` parameter for `usage_data` Closes #36595 See merge request !14091
| * | | | | Remove the `pretty` parameter for `usage_data`rs-remove-usage-ping-prettyRobert Speicher2017-09-062-3/+2
| | | | | |
* | | | | | Merge branch 'gitaly-tree-entries-fix' into 'master'Rémy Coutable2017-09-078-20/+38
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement fix for n+1 issue on `flatten_tree` helper Closes gitaly#530 See merge request !14097
| * | | | | Implement fix for n+1 issue on `flatten_tree` helpergitaly-tree-entries-fixAlejandro Rodríguez2017-09-068-20/+38
| | | | | |
* | | | | | Merge branch 'rs-update-capybara' into 'master'Rémy Coutable2017-09-076-13/+15
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Update capybara 2.6.2 -> 2.15.1 See merge request !13976
| * | | | | Fix failures introduced by Capybara upgraders-update-capybaraRobert Speicher2017-09-054-8/+9
| | | | | |
| * | | | | Update capybara 2.6.2 -> 2.15.1Robert Speicher2017-09-052-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | Changelog: https://git.io/v5403
* | | | | | Merge branch 'fix-mr-tabs-position' into 'master'Phil Hughes2017-09-073-8/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mr tabs position Closes #37487 See merge request !14064
| * | | | | | Fix mr tabs positionAnnabel Dunstone Gray2017-09-073-8/+16
|/ / / / / /
* | | | | | Merge branch 'docs/autodeploy-refactor' into 'master'Achilleas Pipinellis2017-09-077-27/+151
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the Autodeploy docs Closes #37151 See merge request !13906
| * | | | | | Remove confusing Nginx example from Autodeploy docsdocs/autodeploy-refactorAchilleas Pipinellis2017-09-062-79/+17
| | | | | | |
| * | | | | | Refactor Autodeploy docsAchilleas Pipinellis2017-09-061-38/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a how it works section where Herokuish is mentioned - Make the notes more apparent - Merge the postgres variables section with its parent
| * | | | | | Add images from auto deploy guideAchilleas Pipinellis2017-09-065-0/+0
| | | | | | |
| * | | | | | Port changes from Autodeploy EE to CEAchilleas Pipinellis2017-09-062-0/+171
| | | | | | |
* | | | | | | Merge branch 'mk-remove-duplicate-task' into 'master'Douwe Maan2017-09-071-2/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate task `bundle exec rake gettext:po_to_json` from CI See merge request !14098
| * | | | | | | Remove duplicate task gettext:po_to_jsonmk-remove-duplicate-taskMichael Kozono2017-09-061-2/+0
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | It is already run in "bundle exec rake gitlab:assets:compile".
* | | | | | | Merge branch '37023-remove-focus-styles-from-dropdown-empty-link' into 'master'Tim Zallmann2017-09-077-15/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove focus styles from dropdown empty link Closes #37023 See merge request !13907
| * | | | | | | Remove focus styles from dropdown empty link37023-remove-focus-styles-from-dropdown-empty-linkEric Eastwood2017-09-057-15/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37023
* | | | | | | | Merge branch 'add_quick_submission_on_user_settings_page' into 'master'Tim Zallmann2017-09-072-1/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add quick submission on user settings page Closes #37359 See merge request !14007
| * | | | | | | Add quick submission on user settings pageVitaliy @blackst0ne Klachkov2017-09-022-1/+6
| | | | | | | |
* | | | | | | | Merge branch '37532-fix-broken-link-on-kubernetes-monitoring-page-docs' into ↵Achilleas Pipinellis2017-09-061-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix broken link on Kubernetes Monitoring page - docs Closes #37532 See merge request !14094
| * | | | | | | | Fix broken link on Kubernetes Monitoring page - docsJoshua Lambert2017-09-061-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'jk-fix-migrate' into 'master'Robert Speicher2017-09-062-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reset namespace columns in migration See merge request !14089
| * | | | | | | | reset namespace columns in migrationjk-fix-migrateJarka Kadlecova2017-09-062-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'patch-24' into 'master'Robert Speicher2017-09-061-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GITALY_SERVER_VERSION to 0.38.0 See merge request !14087
| * | | | | | | | Update GITALY_SERVER_VERSION to 0.38.0Alejandro Rodríguez2017-09-061-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch '35811-fix-copy-link-text-color' into 'master'Tim Zallmann2017-09-061-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix text color for `Copy link` action on Note more actions dropdown See merge request !14084
| * | | | | | | | | Prevent `btn-transparent` class from being added on `Copy link` actionkushalpandya2017-09-061-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'winh-dropdown-changelog-docs' into 'master'Annabel Dunstone Gray2017-09-061-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog entry for new dropdown styles See merge request !14092
| * | | | | | | | | | Add changelog entry for new dropdown stylesWinnie Hellmann2017-09-061-0/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge branch ↵Kamil Trzciński2017-09-063-2/+11
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/33281-activerecord-recordinvalid-when-build-has-nil-protected' into 'master' Fix 422 error when retry job Closes #33281 See merge request !14082
| * | | | | | | | | | Fix specShinya Maeda2017-09-071-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Remove only validationfix/sm/33281-activerecord-recordinvalid-when-build-has-nil-protectedShinya Maeda2017-09-072-2/+0
| | | | | | | | | | |
| * | | | | | | | | | Revert set_protectedShinya Maeda2017-09-074-12/+12
| | | | | | | | | | |
| * | | | | | | | | | Fix /models/ci/pipeline.rbShinya Maeda2017-09-061-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Use before_save :set_protectedShinya Maeda2017-09-065-12/+23
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'anakashima/gitlab-ce-fix_wiki_toc_indent' into 'master'Sean McGivern2017-09-063-18/+113
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wiki table of contents are now properly nested to reflect header level See merge request !13909
| * | | | | | | | | Refactor table of contents buildingRobert Speicher2017-09-061-19/+11
| | | | | | | | | |
View Lorry Controller Status