summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Keep label on issue when movingccr/maintain_labelsChantal Rollison2018-06-263-4/+30
* Merge branch 'blackst0ne-rails5-fix-data-store-spec' into 'master'Kamil Trzciński2018-06-222-8/+5
|\
| * [Rails5] Fix "'-1' is not a valid data_store"blackst0ne-rails5-fix-data-store-specblackst0ne2018-06-162-8/+5
* | Merge branch 'patch-29' into 'master'Kamil Trzciński2018-06-221-26/+26
|\ \
| * | Update lfs_administration.md with language editsMarcel Amirault2018-06-181-26/+26
* | | Merge branch 'docs/sm/trouble-shooting-guid-for-timeout-of-background-upload'...Kamil Trzciński2018-06-221-13/+82
|\ \ \ | |/ /
| * | Add troubleshooring guid for lfs uploading timeoutsdocs/sm/trouble-shooting-guid-for-timeout-of-background-uploadShinya Maeda2018-06-181-13/+82
* | | Merge branch 'zj-find-ref-name' into 'master'Douwe Maan2018-06-221-11/+1
|\ \ \
| * | | FindRefName RPC now mandatoryzj-find-ref-nameZeger-Jan van de Weg2018-06-221-11/+1
* | | | Merge branch 'docs-add-inline-badges-autodevops' into 'master'Achilleas Pipinellis2018-06-221-6/+6
|\ \ \ \
| * | | | add inline badges to auto devops feature listdocs-add-inline-badges-autodevopsMarcia Ramos2018-06-221-6/+6
* | | | | Merge branch 'update-large-tables-cop' into 'master'Grzegorz Bizon2018-06-222-2/+33
|\ \ \ \ \
| * | | | | Add more large tables to copupdate-large-tables-copSean McGivern2018-06-221-1/+5
| * | | | | Disallow methods that copy data on large tablesSean McGivern2018-06-192-1/+28
* | | | | | Merge branch 'bjk/48176_ruby_gc' into 'master'Yorick Peterse2018-06-224-13/+34
|\ \ \ \ \ \
| * | | | | | Cleanup ruby sampler metricsbjk/48176_ruby_gcBen Kochie2018-06-224-13/+34
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'zj-repository-size' into 'master'Douwe Maan2018-06-221-15/+1
|\ \ \ \ \ \
| * | | | | | Repository size is Gitaly onlyzj-repository-sizeZeger-Jan van de Weg2018-06-221-15/+1
* | | | | | | Merge branch 'unify-filter_issues_spec.rb' into 'master'Nick Thomas2018-06-221-2/+34
|\ \ \ \ \ \ \
| * | | | | | | Bring changes from EEunify-filter_issues_spec.rbLin Jen-Shin2018-06-211-2/+34
* | | | | | | | Merge branch 'docs-request-cache' into 'master'Sean McGivern2018-06-222-36/+42
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add docs for RequestCache, moved from commentsLin Jen-Shin2018-06-222-36/+42
* | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |