summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add index on runner_type for ci_runners46010-add-index-to-runner-typeDylan Griffith2018-05-153-1/+22
* Merge branch 'correct-runner-type-when-assigning-shared-to-project' into 'mas...Kamil Trzciński2018-05-112-7/+27
|\
| * Ensure Ci::Runner#assign_to errors for group runnerscorrect-runner-type-when-assigning-shared-to-projectDylan Griffith2018-05-102-7/+22
| * Ensure runner_type is updated correctly when assigning shared runner to projectDylan Griffith2018-05-102-1/+6
* | Merge branch '46210-terms-acceptance-dropdown-menu' into 'master'Tim Zallmann2018-05-113-4/+14
|\ \
| * | 46210 Display logo and user dropdown on mobile for terms page and fix styling46210-terms-acceptance-dropdown-menutauriedavis2018-05-093-4/+14
* | | Merge branch '40725-move-mr-external-link-to-right' into 'master'Phil Hughes2018-05-112-1/+6
|\ \ \
| * | | Moves MR widget external link icon to the rightJacopo2018-05-082-1/+6
* | | | Merge branch 'docs-42067-document-runner-registration-api' into 'master'Achilleas Pipinellis2018-05-112-0/+88
|\ \ \ \
| * | | | Expand documentation for Runners APIMark Fletcher2018-05-102-0/+88
* | | | | Merge branch 'docs-helm-init-before-helm-repo-add' into 'master'Achilleas Pipinellis2018-05-111-1/+1
|\ \ \ \ \
| * | | | | Helm init before helm repo addMaxime2018-05-111-1/+1
* | | | | | Merge branch '44956-wiki-headings-no-longer-show-anchor-link' into 'master'Clement Ho2018-05-104-7/+12
|\ \ \ \ \ \
| * | | | | | Fix missing anchor link on wiki page44956-wiki-headings-no-longer-show-anchor-linkJose2018-05-084-7/+12
* | | | | | | Merge branch 'bw-fix-sha-attribute' into 'master'Stan Hu2018-05-102-5/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | only issue a warning if column doesn't existBrett Walker2018-05-102-5/+8
* | | | | | | Merge branch 'update-gon' into 'master'Robert Speicher2018-05-102-4/+3
|\ \ \ \ \ \ \
| * | | | | | | Update gon ~> 6.1.0 to ~> 6.2Pirate Praveen2018-05-052-4/+3
* | | | | | | | Merge branch 'fix/wiki-find-page-invalid-encoding' into 'master'Robert Speicher2018-05-104-1/+31
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix finding wiki pages when they have invalidly-encoded contentAhmad Sherif2018-05-094-1/+31
* | | | | | | | Merge branch 'ide-hide-merge-request-if-disabled' into 'master'Filipa Lacerda2018-05-105-1/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | fixed specsPhil Hughes2018-05-102-7/+4
| * | | | | | | | Hide merge request option in IDE when merge requests are disabledPhil Hughes2018-05-094-1/+29
| |/ / / / / / /
* | | | | | | | Merge branch 'jr-46209-web-ide-copy' into 'master'Tim Zallmann2018-05-102-2/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix outdated web ide copyjr-46209-web-ide-copyJames Ramsay2018-05-102-2/+7
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '41229-include-the-human-repo-name-in-gitlab-shell-log-when-hash...Nick Thomas2018-05-101-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Include project.full_path when moving repoAsh McKenzie2018-05-101-1/+1
* | | | | | | | | Merge branch 'sh-reset-prometheus-metrics-tests' into 'master'Nick Thomas2018-05-106-3/+41
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Support resetting of Prometheus metrics between test runsStan Hu2018-05-096-3/+41
* | | | | | | | | | Merge branch 'jej/fix-accidental-ee-directory' into 'master'Dmitriy Zaporozhets2018-05-102-51/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove accidental EE additions in CEjej/fix-accidental-ee-directoryJames Edwards-Jones2018-05-102-51/+0
* | | | | | | | | | | Merge branch 'mk/fix-intermittent-qa-test-failure' into 'master'Grzegorz Bizon2018-05-102-14/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Succeed or fail fast based on job status firstMichael Kozono2018-05-082-14/+20
* | | | | | | | | | | | Merge branch '45442-updates-updated-at-to-issue-on-time-spent' into 'master'Douwe Maan2018-05-104-9/+48
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Updates updated_at on issue when using /spend quick actionJacopo2018-05-094-9/+48
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ce-jej/group-saml-skip-forgery-protection' into 'master'Douwe Maan2018-05-101-5/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Backport with_forgery_protection spec helperJames Edwards-Jones2018-05-081-5/+12
* | | | | | | | | | | | Merge branch 'backport-rd-5566-improve-performance-of-repository-size-limit-c...Douwe Maan2018-05-105-17/+55
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Backport some changes from gitlab-ee!5476Rubén Dávila2018-05-095-17/+55
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '46147-remove-model-redefinition-worker' into 'master'Douwe Maan2018-05-102-149/+95
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | apply feedbackMicaël Bergeron2018-05-091-3/+3
| * | | | | | | | | | | remove the `Upload` redefinition in `MigrateUploadsWorker`Micaël Bergeron2018-05-082-149/+95
* | | | | | | | | | | | Merge branch 'blackst0ne-replace-spinach-project-issues-references.feature' i...Robert Speicher2018-05-096-254/+272
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Replace the `project/issues/references.feature` spinach test with an rspec an...blackst0ne2018-05-096-254/+272
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'blackst0ne-replace-spinach-project-deploy-keys.feature' into 'm...Robert Speicher2018-05-095-144/+130
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Replace the `project/deploy_keys.feature` spinach test with an rspec analogblackst0ne2018-05-095-144/+130
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch '46032/cycle-analytics-service-axios' into 'master'Clement Ho2018-05-092-15/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | refactor 'cycle_analytics' to use axiosPaul Slaughter2018-05-092-15/+17
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'dm-repository-xcode-project' into 'master'Robert Speicher2018-05-093-3/+41
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add Repository#xcode_project? methodDouwe Maan2018-05-093-3/+41