summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add inline badges to auto devops feature listdocs-add-inline-badges-autodevopsMarcia Ramos2018-06-221-6/+6
* Merge branch 'docs-squash-merge-heading' into 'master'Marcia Ramos2018-06-221-3/+3
|\
| * Update squash_and_merge.md to fix link and descriptionMarcel Amirault2018-06-221-3/+3
|/
* Merge branch 'docs/api-runners-ip' into 'master'Marcia Ramos2018-06-221-0/+12
|\
| * Add ip_address to json examples in Runner API docsAchilleas Pipinellis2018-06-221-0/+12
* | Merge branch 'zj-ls-files-mandatory' into 'master'Douwe Maan2018-06-221-34/+1
|\ \ | |/ |/|
| * Git ls files is Gitaly only nowZeger-Jan van de Weg2018-06-221-34/+1
* | Merge branch 'unify-redis_shared_examples.rb' into 'master'Sean McGivern2018-06-221-1/+8
|\ \
| * | Bring changes from EEunify-redis_shared_examples.rbLin Jen-Shin2018-06-211-1/+8
* | | Merge branch 'docs/autodevops-k8s' into 'master'Marcia Ramos2018-06-2230-159/+308
|\ \ \ | |_|/ |/| |
| * | Add paragraph for self-hosted instancesdocs/autodevops-k8sAchilleas Pipinellis2018-06-221-1/+6
| * | Edits to quick_start_guide.mdMike Lewis2018-06-211-61/+51
| * | Document end to end flow for Kubernetes and Auto DevOpsAchilleas Pipinellis2018-06-2130-159/+313
* | | Merge branch 'blackst0ne-fix-protect-from-forgery-in-application-controller' ...Douwe Maan2018-06-226-5/+10
|\ \ \
| * | | [Rails5] Force the `protect_from_forgery` callback run firstblackst0ne-fix-protect-from-forgery-in-application-controllerblackst0ne2018-06-216-5/+10
* | | | Merge branch 'unify-object_storage_spec.rb' into 'master'Douwe Maan2018-06-221-0/+12
|\ \ \ \
| * | | | Bring this test from EEunify-object_storage_spec.rbLin Jen-Shin2018-06-211-0/+12
* | | | | Merge branch 'unify-container_registry_authentication_service_spec.rb' into '...Grzegorz Bizon2018-06-221-0/+13
|\ \ \ \ \
| * | | | | Bring changes from EEunify-container_registry_authentication_service_spec.rbLin Jen-Shin2018-06-211-0/+13
* | | | | | Merge branch 'unify-destroy_service_spec.rb' into 'master'Robert Speicher2018-06-211-2/+6
|\ \ \ \ \ \
| * | | | | | Use expect_next_instance_of to replace expect_any_instance_ofunify-destroy_service_spec.rbLin Jen-Shin2018-06-211-2/+6
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'sh-add-recaptcha-all-logins' into 'master'Robert Speicher2018-06-215-6/+88
|\ \ \ \ \ \
| * | | | | | Show a reCAPTCHA on signin page if custom header is setStan Hu2018-06-215-6/+88
* | | | | | | Merge branch 'retroactive-changelogs' into 'master'Clement Ho2018-06-212-0/+10
|\ \ \ \ \ \ \
| * | | | | | | Retroactively add changelogsgfyoung2018-06-212-0/+10
* | | | | | | | Merge branch 'fix-webpack-node-env' into 'master'Clement Ho2018-06-212-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | disable nodeEnv within karma configfix-webpack-node-envfix-foo-testMike Greiling2018-06-211-0/+1
| * | | | | | | enable accidentally-disabled nodeEnv optimizationMike Greiling2018-06-211-1/+0
* | | | | | | | Merge branch 'fix-diff-comment-alignment' into 'master'Mike Greiling2018-06-212-5/+4
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | fix z-index and vertically centerfix-diff-comment-alignmentSimon Knox2018-06-201-1/+3
| * | | | | | | fix add diff comment icon positionSimon Knox2018-06-202-8/+1
| * | | | | | | Fix diff comment alignment for parallel code additionsClement Ho2018-06-191-0/+4
* | | | | | | | Merge branch 'move-boards-modal-empty-state-vue-component' into 'master'Filipa Lacerda2018-06-214-32/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | Move boards modal EmptyState vue componentGeorge Tsiolis2018-06-214-32/+41
* | | | | | | | | Merge branch 'sh-fix-login-active-tabs' into 'master'Clement Ho2018-06-211-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix multiple active tabs when Crowd or LDAP is in useStan Hu2018-06-211-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge branch 'unify-project_features_apply_to_issuables_shared_examples.rb' i...Robert Speicher2018-06-211-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bring changes from EELin Jen-Shin2018-06-211-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-raspi-issues' into 'master'Clement Ho2018-06-211-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow omnibus to disable sourcemaps in memory constrained environmentsMike Greiling2018-06-211-1/+4
|/ / / / / / / / /
* | | | | | | | | Merge branch 'jl-helm-docs' into 'master'Marcia Ramos2018-06-218-32/+395
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add `gitlab` chart documentationJoshua Lambert2018-06-218-32/+395
|/ / / / / / / /
* | | | | | | | Merge branch 'ce-6436-6149-unify-project_creator_spec' into 'master'Robert Speicher2018-06-218-11/+78
|\ \ \ \ \ \ \ \
| * | | | | | | | Add docs around expect_next_instance_ofce-6436-6149-unify-project_creator_specLin Jen-Shin2018-06-211-0/+48
| * | | | | | | | Implement `expect_next_instance_of` and use itLin Jen-Shin2018-06-217-11/+30
| |/ / / / / / /
* | | | | | | | Merge branch 'no-multi-assign-follow-up' into 'master'Clement Ho2018-06-216-18/+17
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Follow-up to !19808: Split up for-loop initializationsgfyoung2018-06-216-18/+17
|/ / / / / / /
* | | | | | | Merge branch 'restore-custom-hooks-wiki' into 'master'Douwe Maan2018-06-211-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Restore custom hooks for wikirestore-custom-hooks-wikiAhmad Hassan2018-06-211-0/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'changes_tab_vue_refactoring' into 'master'Tim Zallmann2018-06-21221-2282/+8933
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |