summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [Rails5] Apply gitlab-ruby bundle poisoning in CI fixblackst0ne-rails5-masterblackst0ne2018-05-115-25/+143
* Merge branch 'zj-wiki-find-file-opt-out' into 'master'Douwe Maan2018-05-112-1/+7
|\
| * Wiki Find Page to opt_outZeger-Jan van de Weg2018-05-112-1/+7
* | Merge branch 'blackst0ne-rails5-bump-rails5-to-5-0-7' into 'master'Douwe Maan2018-05-112-63/+59
|\ \
| * | [Rails5] Bump Rails to 5.0.7 and set `atomic` to 1.1.99blackst0ne-rails5-bump-rails5-to-5-0-7blackst0ne2018-05-112-63/+59
| |/
* | Merge branch '46233-rails5-fix-nomethoderror-undefined-method-for-3-string' i...Douwe Maan2018-05-111-1/+1
|\ \
| * | [Rails5] Fix `per_page` in lib/gitlab/multi_collection_paginator.rb46233-rails5-fix-nomethoderror-undefined-method-for-3-stringblackst0ne2018-05-111-1/+1
| |/
* | Merge branch 'blackst0ne-rails5-fix-route-source-can-t-be-blank' into 'master'Douwe Maan2018-05-111-1/+3
|\ \
| * | [Rails5] Fix `Route source can't be blank`blackst0ne-rails5-fix-route-source-can-t-be-blankblackst0ne2018-05-111-1/+3
| |/
* | Merge branch '46225-rails5-fix-app-views-groups-issues-html-haml' into 'master'Douwe Maan2018-05-111-1/+1
|\ \
| * | [Rails5] Fix app/views/groups/issues.html.haml46225-rails5-fix-app-views-groups-issues-html-hamlblackst0ne2018-05-111-1/+1
| |/
* | Merge branch '5710-add-contact-sales-option-for-epics' into 'master'Tim Zallmann2018-05-111-3/+6
|\ \
| * | Support `js-close` as a removal class in UserCalloutLukas Eipert2018-05-111-3/+6
|/ /
* | Merge branch 'ide-mr-open-file-fix' into 'master'Filipa Lacerda2018-05-113-2/+27
|\ \
| * | Fixed none merge request files not being openable in the web IDEPhil Hughes2018-05-103-2/+27
* | | Merge branch 'ce-5911-extract-ee-specific-files-lines-for-spec-models-cluster...Kamil Trzciński2018-05-113-11/+73
|\ \ \
| * | | Backport CE changes from gitlab-ee#518a29073a9Matija Čupić2018-05-101-2/+2
| * | | Stub deployments in Clusters::Platforms::Kubernetes specMatija Čupić2018-05-101-1/+4
| * | | Backport KubernetesHelper deployment related changesMatija Čupić2018-05-101-3/+66
| * | | Backport EE runner spec changes to CEMatija Čupić2018-05-101-5/+1
* | | | Merge branch 'fix-registry-created-at-tooltip' into 'master'Kamil Trzciński2018-05-112-1/+12
|\ \ \ \
| * | | | Add changelog entryLars Greiss2018-05-071-0/+5
| * | | | Add missing tooltip to creation date on container registry overviewLars Greiss2018-05-071-1/+7
* | | | | Merge branch 'zj-validation-initializer' into 'master'Kamil Trzciński2018-05-114-32/+39
|\ \ \ \ \
| * | | | | Remove method call to deprecated methodZeger-Jan van de Weg2018-05-114-32/+39
* | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \