summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix bad merge in app/assets/javascripts/environments/components/environment_i...scheduled-manual-jobs-environment-play-buttonsWinnie Hellmann2018-11-051-1/+1
* Add scheduled_actions to JSON schemaWinnie Hellmann2018-10-241-0/+4
* Update translations in locale/gitlab.potWinnie Hellmann2018-10-241-1/+1
* Use secondary text color for delayed job timerWinnie Hellmann2018-10-221-1/+4
* Add permission check for delayed job actionsWinnie Hellmann2018-10-221-6/+2
* Update confirmation modal text for starting delayed jobs immediatelyWinnie Hellmann2018-10-222-2/+2
* Merge branch 'master' into scheduled-manual-jobs-environment-play-buttonsWinnie Hellmann2018-10-222003-20531/+164530
|\
| * Merge branch 'docs-accepting-merge-requests-label-is-the-ssot' into 'master'Mek Stittri2018-10-223-22/+23
| |\
| | * Make the 'Accepting merge requests' workflow consistentdocs-accepting-merge-requests-label-is-the-ssotRémy Coutable2018-10-223-22/+23
| * | Merge branch 'mg-update-prettier-script' into 'master'Clement Ho2018-10-225-116/+105
| |\ \
| | * | Fix/update prettier scriptMike Greiling2018-10-225-116/+105
| |/ /
| * | Merge branch 'winh-extract-job-container-item' into 'master'Mike Greiling2018-10-224-47/+149
| |\ \
| | * | Extract JobContainerItem componentWinnie Hellmann2018-10-224-47/+149
| |/ /
| * | Merge branch 'backport-ee-import-url-rescue' into 'master'Robert Speicher2018-10-221-0/+2
| |\ \
| | * | Backport rescue in Project#import_url from EEbackport-ee-import-url-rescueYorick Peterse2018-10-221-0/+2
| * | | Merge branch 'qa-backport-recent-ee-changes' into 'master'Douglas Barbosa Alexandre2018-10-225-57/+115
| |\ \ \ | | |_|/ | |/| |
| | * | [QA] Port recent changes from EEqa-backport-recent-ee-changesRémy Coutable2018-10-225-57/+115
| * | | Merge branch 'patch-28' into 'master'Marcia Ramos2018-10-221-1/+3
| |\ \ \
| | * | | docs-Update proofreader.mdRay Paik2018-10-221-1/+3
| |/ / /
| * | | Merge branch 'docs/refactor-repository-mirroring' into 'master'Marcia Ramos2018-10-2220-254/+297
| |\ \ \ | | |_|/ | |/| |
| | * | Update repository mirroring documentation to reflect current state.Evan Read2018-10-2220-254/+297
| |/ /
| * | Merge branch 'leipert-danger-fix-moved-files' into 'master'Rémy Coutable2018-10-226-8/+39
| |\ \
| | * | Create helper to get all changed filesleipert-danger-fix-moved-filesLukas Eipert2018-10-226-8/+39
| * | | Merge branch 'patch-30' into 'master'Achilleas Pipinellis2018-10-221-74/+2
| |\ \ \
| | * | | Update index.mdpatch-30Ray Paik2018-10-181-74/+2
| * | | | Merge branch 'patch-29' into 'master'Achilleas Pipinellis2018-10-221-1/+1
| |\ \ \ \
| | * | | | Update CONTRIBUTING.mdRay Paik2018-10-181-1/+1
| | |/ / /
| * | | | Merge branch 'abuango-office365-broken-link-fix' into 'master'Achilleas Pipinellis2018-10-221-1/+1
| |\ \ \ \
| | * | | | Update Guide for Microsoft Teams Notification IntegrationAbubakar Siddiq Ango2018-10-221-1/+1
| |/ / / /
| * | | | Merge branch 'ce-52112-fix-review-apps-cleanup-ce' into 'master'Nick Thomas2018-10-225-86/+271
| |\ \ \ \
| | * | | | Improve automated Review Apps cleanupce-52112-fix-review-apps-cleanup-ceRémy Coutable2018-10-225-86/+271
| | | |_|/ | | |/| |
| * | | | Merge branch 'mk/backport-use-strings-for-context-description-qa' into 'master'Rémy Coutable2018-10-2232-33/+33
| |\ \ \ \
| | * | | | Use strings for context descriptionsmk/backport-use-strings-for-context-description-qaMichael Kozono2018-10-1832-33/+33
| * | | | | Merge branch 'ml-qa-logging' into 'master'Nick Thomas2018-10-2211-13/+287
| |\ \ \ \ \
| | * | | | | Log page actionsml-qa-loggingMark Lapierre2018-10-1911-13/+287
| * | | | | | Merge branch 'mr-creation-source-project-filtering' into 'master'Filipa Lacerda2018-10-223-1/+31
| |\ \ \ \ \ \
| | * | | | | | Fixed source projects not filteringPhil Hughes2018-10-223-1/+31
| * | | | | | | Merge branch 'refactor-cluster-create-service-spec' into 'master'Dmitriy Zaporozhets2018-10-222-75/+87
| |\ \ \ \ \ \ \
| | * | | | | | | Move shared examples into the only file where usedrefactor-cluster-create-service-specThong Kuah2018-10-172-75/+87
| * | | | | | | | Merge branch 'docs-fix-sbt-version-in-test-scala-application' into 'master'Achilleas Pipinellis2018-10-221-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Update test-scala-application.md to use sbtVersion instead of sbt-versiondocs-fix-sbt-version-in-test-scala-applicationRémy Coutable2018-10-221-1/+1
| * | | | | | | | Merge branch 'drop-allow_overflow-option-duration_in_numbers' into 'master'Grzegorz Bizon2018-10-226-39/+25
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix specdrop-allow_overflow-option-duration_in_numbersShinya Maeda2018-10-181-2/+2
| | * | | | | | | | Add changelogShinya Maeda2018-10-181-0/+5
| | * | | | | | | | Drop `allow_overflow` option in `TimeHelper.duration_in_numbers`Shinya Maeda2018-10-184-37/+18
| * | | | | | | | | Merge branch 'improve-specs-for-ci-processbuildservice' into 'master'Grzegorz Bizon2018-10-221-155/+77
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Simplify the specimprove-specs-for-ci-processbuildserviceShinya Maeda2018-10-181-104/+97
| | * | | | | | | | | Improve specs for Ci::ProcessBuildServiceShinya Maeda2018-10-181-161/+90
| | |/ / / / / / / /
| * | | | | | | | | Merge branch '52559-applications-api-get-delete' into 'master'Rémy Coutable2018-10-228-15/+181
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Disable offense on the appropriate line only !22296JB Vasseur2018-10-191-6/+2