summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update gitlab-ci.ymlblackst0ne-add-gemfile-rails5-lock-checkblackst0ne2018-06-121-1/+1
* Remove Gitlab.rails5.lock.origblackst0ne2018-06-121-1209/+0
* Update gitlab-ciblackst0ne2018-06-121-2/+1
* Update script and gitlab-ciblackst0ne2018-06-124-22/+1230
* Add changelog entryblackst0ne2018-06-091-0/+5
* Fix gitlab-ci.ymlblackst0ne2018-06-091-0/+1
* Fix gitlab-ci.ymlblackst0ne2018-06-091-1/+2
* Add CI job to check Gemfile.rails5.lockblackst0ne2018-06-092-0/+26
* Merge branch 'blackst0ne-bump-grape-path-helpers-gem-to-1-0-5' into 'master'Stan Hu2018-06-083-7/+14
|\
| * Bump grape-path-helpers to 1.0.5blackst0ne2018-06-083-7/+14
|/
* Merge branch 'sh-log-destroy-attempt' into 'master'Robert Speicher2018-06-081-0/+5
|\
| * Add more logging before a project is destroyedStan Hu2018-06-081-0/+5
* | Merge branch 'bvl-terms-on-registration' into 'master'Robert Speicher2018-06-0815-120/+248
|\ \
| * | Users can accept terms during registrationBob Van Landuyt2018-06-0815-120/+248
* | | Merge branch 'sh-bump-google-chrome' into 'master'Mike Greiling2018-06-081-1/+1
|\ \ \ | |_|/ |/| |
| * | Bump Google Chrome to V67Stan Hu2018-06-081-1/+1
|/ /
* | Merge branch 'fix-artifact-breadcrumb' into 'master'Annabel Gray2018-06-081-2/+2
|\ \
| * | Fix artifact breadcrumbClement Ho2018-06-081-2/+2
* | | Merge branch 'rs-schema-spec-parity' into 'master'Nick Thomas2018-06-081-1/+5
|\ \ \
| * | | Refactor schema_spec.rb for CE-EE parity and simplicityRobert Speicher2018-06-071-1/+5
* | | | Merge branch '47532-follow-up-from-resolve-add-deploy-strategies-to-auto-devo...Achilleas Pipinellis2018-06-081-3/+27
|\ \ \ \
| * | | | Copyedit Auto DevOps deployment strategy docsAchilleas Pipinellis2018-06-081-11/+22
| * | | | Add brief technical explanation for deploy strategies variablesMatija Čupić2018-06-081-0/+2
| * | | | Link option descriptionsMatija Čupić2018-06-071-2/+2
| * | | | Add option descriptionsMatija Čupić2018-06-071-0/+2
| * | | | Add deployment strategy docsMatija Čupić2018-06-071-0/+9
* | | | | Merge branch '47519-discussion-padding' into 'master'Clement Ho2018-06-081-4/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove padding on .codeAnnabel Dunstone Gray2018-06-071-4/+0
* | | | | Merge branch 'update-11-0-templates' into 'master'Mayra Cabrera2018-06-0810-240/+31
|\ \ \ \ \
| * | | | | Updates templates for 11.0Filipa Lacerda2018-06-0810-240/+31
* | | | | | Merge branch 'rails5-fix-47370' into 'master'Douwe Maan2018-06-083-114/+128
|\ \ \ \ \ \
| * | | | | | Use same gem versions for rails5 as for rails4 where possibleJasper Maes2018-06-073-114/+128
* | | | | | | Merge branch 'remove-settings-title-suffix' into 'master'Clement Ho2018-06-088-31/+144
|\ \ \ \ \ \ \
| * | | | | | | Update settings section titlesAndreas Kämmerle2018-06-088-31/+144
|/ / / / / / /
* | | | | | | Merge branch 'update-licenses-11-0' into 'master'Mayra Cabrera2018-06-081-267/+122
|\ \ \ \ \ \ \
| * | | | | | | Update the dependencies license listAlessio Caiazza2018-06-081-267/+122
* | | | | | | | Merge branch 'revert-rename-allow_collaboration-column' into 'master'Yorick Peterse2018-06-087-8/+56
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert rename allow collaboration columnMark Chao2018-06-087-8/+56
|/ / / / / / / /
* | | | | | | | Merge branch '45400-automatically-created-mr-uses-wrong-target-branch-when-br...Sean McGivern2018-06-083-4/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve "Automatically created MR uses wrong target branch (when branching fr...Athar Hameed2018-06-083-4/+16
|/ / / / / / / /
* | | | | | | | Merge branch 'use-restore-custom-hooks-gitaly' into 'master'Douwe Maan2018-06-084-31/+63
|\ \ \ \ \ \ \ \
| * | | | | | | | RefactorAhmad Hassan2018-06-081-35/+32
| * | | | | | | | Use RestoreCustomHooks RPC in restore rake taskAhmad Hassan2018-06-074-13/+48
* | | | | | | | | Merge branch 'fix-notification-recipient-service-spec-for-ee' into 'master'Douwe Maan2018-06-081-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix NotificationRecipientService spec for EESean McGivern2018-06-081-3/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '5974-geo-unauthenticated-rate-limits-should-not-block-geo-reque...Douwe Maan2018-06-081-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/58765974-geo-unauthenticated-rate-limits-should-not-block-geo-requestsValery Sizov2018-05-291-1/+5
* | | | | | | | | | Merge branch 'lib-gitlab-git-version-popen' into 'master'Douwe Maan2018-06-082-1/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove Gitlab::Popen dependency from lib/gitlab/gitJacob Vosmaer2018-06-082-1/+12
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'qa-251-api-tests' into 'master'Grzegorz Bizon2018-06-089-126/+193
|\ \ \ \ \ \ \ \ \ \