summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Prevent nil exception in environment statusstateful_deploymentsShinya Maeda2018-11-061-2/+2
* Fix flaky specShinya Maeda2018-11-061-5/+6
* Fix specShinya Maeda2018-11-062-16/+1
* Use fire_state_eventShinya Maeda2018-11-061-1/+1
* Create deployments only if action: startShinya Maeda2018-11-064-1/+29
* Squashed commit of the following:Shinya Maeda2018-11-0654-407/+1079
* Merge branch '53224-rename-to-resource-base-qa' into 'master'Douglas Barbosa Alexandre2018-11-0585-1615/+1601
|\
| * Rename QA::Factory to QA::Resource53224-rename-to-resource-base-qaLin Jen-Shin2018-11-0585-1615/+1601
* | Merge branch 'fix-codequality' into 'master'testing-review-app-passwordGrzegorz Bizon2018-11-052-2/+2
|\ \
| * | Fix invalid artifact path for codequalityfix-codequalityKamil Trzciński2018-11-052-2/+2
* | | Merge branch '48239-performance-info-ref' into 'master'Stan Hu2018-11-054-10/+26
|\ \ \
| * | | Make migration symmetric48239-performance-info-refMark Chao2018-11-051-1/+2
| * | | Combine two updates in one queryMark Chao2018-11-051-9/+3
| * | | Add index to speed up loading projects from DeployTokenMark Chao2018-11-052-0/+18
| * | | Memorize project to avoid re-queryMark Chao2018-11-051-1/+4
* | | | Merge branch '53362-allow-concurrency-in-puma' into 'master'Stan Hu2018-11-053-1/+8
|\ \ \ \
| * | | | Allow concurrency when using PumaAndrew Newdigate2018-11-053-1/+8
|/ / / /
* | | | Merge branch 'gl-ui-tooltip-2' into 'master'Filipa Lacerda2018-11-055-4/+18
|\ \ \ \
| * | | | Remove gitlab-ui's tooltip from globalClement Ho2018-11-055-4/+18
|/ / / /
* | | | Merge branch '52925-scheduled-pipelines-ui-problems' into 'master'Clement Ho2018-11-053-4/+15
|\ \ \ \
| * | | | Fix pipeline schedule style issuesScott Hampton2018-11-053-4/+15
|/ / / /
* | | | Merge branch 'disallow-retry-of-old-builds' into 'master'Grzegorz Bizon2018-11-0524-38/+270
|\ \ \ \ | |_|_|/ |/| | |
| * | | Allow to make builds soft-archived.disallow-retry-of-old-buildsKamil Trzciński2018-11-0524-38/+270
| | |/ | |/|
* | | Merge branch 'use_tokenauthenticatable_method_for_token_lookup' into 'master'Sean McGivern2018-11-055-14/+11
|\ \ \
| * | | Remove PersonalAccessTokensFinder#find_by methoduse_tokenauthenticatable_method_for_token_lookupImre Farkas2018-11-055-14/+11
* | | | Merge branch '52300-pool-repositories' into 'master'Sean McGivern2018-11-0513-0/+177
|\ \ \ \
| * | | | Start tracking pool repositoriesNick Thomas2018-11-059-0/+80
| * | | | Start tracking shards in the databaseNick Thomas2018-11-056-0/+97
* | | | | Merge branch 'sh-fix-issue-52176' into 'master'Yorick Peterse2018-11-053-0/+36
|\ \ \ \ \
| * | | | | Disable replication lag check for Aurora PostgreSQL databasessh-fix-issue-52176Stan Hu2018-11-033-0/+36
* | | | | | Merge branch 'gt-update-project-and-group-labels-empty-state' into 'master'Annabel Dunstone Gray2018-11-055-5/+14
|\ \ \ \ \ \
| * | | | | | Remove empty state button margin on small viewportsGeorge Tsiolis2018-11-032-1/+2
| * | | | | | Update project and group labels empty stateGeorge Tsiolis2018-11-024-5/+13
* | | | | | | Merge branch 'issue_51323' into 'master'Phil Hughes2018-11-0521-21/+158
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add 'only history' option to notes filterFelipe Artur2018-11-0521-21/+158
|/ / / / / /
* | | | | | Merge branch 'zj-bump-gitaly-0-128' into 'master'Douwe Maan2018-11-052-1/+6
|\ \ \ \ \ \
| * | | | | | Bump Gitaly to 0.128.0Zeger-Jan van de Weg2018-11-052-1/+6
* | | | | | | Merge branch 'scheduled-manual-jobs-environment-play-buttons' into 'master'Tim Zallmann2018-11-0515-92/+309
|\ \ \ \ \ \ \
| * | | | | | | 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
| |\ \ \ \ \ \ \
| * | | | | | | | Add spec for Deployment#scheduled_actionsShinya Maeda2018-10-181-1/+16
| * | | | | | | | Make frontend files prettierWinnie Hellmann2018-10-152-2/+7
| * | | | | | | | Use regex for the extecped timeShinya Maeda2018-10-121-2/+1
| * | | | | | | | Improve deployment entity specShinya Maeda2018-10-121-4/+4
| * | | | | | | | Add changelogShinya Maeda2018-10-101-0/+5