summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Delete non-latest merge request diff files upon diffs reloadosw-delete-non-latest-mr-diff-files-upon-mergeOswaldo Ferreira2018-06-2418-88/+346
* Merge branch 'mk/log-invalid-byte-sequence-in-us-ascii-qa' into 'master'consolidate-capitalization-profileStan Hu2018-06-231-6/+18
|\
| * Log push output on exceptionmk/log-invalid-byte-sequence-in-us-ascii-qaMichael Kozono2018-06-221-6/+18
* | Merge branch 'jl-helm-polish-docs' into 'master'48315-add-jsconfig-json-file-to-map-our-custom-webpack-resolve-pathsMike Lewis2018-06-222-9/+10
|\ \
| * | Update gitlab_chart.mdMike Lewis2018-06-221-1/+1
| * | Simplify the decode secret stepjl-helm-polish-docsJoshua Lambert2018-06-221-11/+1
| * | Add a missing periodJoshua Lambert2018-06-221-1/+1
| * | Push CPU requirement to 6Joshua Lambert2018-06-211-1/+1
| * | Add additional commands for Mac OS for retrieving the passwordJoshua Lambert2018-06-211-3/+14
| * | Fix helm update commandJoshua Lambert2018-06-211-1/+1
| * | Minor polishJoshua Lambert2018-06-211-2/+2
* | | Merge branch '48296-remove-top-padding-on-gpg-popovers' into 'master'46524-sourcemaps-in-vue-files-are-brokenMike Greiling2018-06-221-0/+6
|\ \ \
| * | | Remove top margin for bootstrap popover headers48296-remove-top-padding-on-gpg-popoversClement Ho2018-06-221-0/+6
* | | | Merge branch 'rs-update-sprockets' into 'master'Stan Hu2018-06-221-1/+1
|\ \ \ \
| * | | | Bump sprockets to 3.7.2 to address CVE-2018-3760Robert Speicher2018-06-221-1/+1
* | | | | Merge branch 'unify-match_ids.rb' into 'master'Robert Speicher2018-06-221-0/+7
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Bring changes from EELin Jen-Shin2018-06-221-0/+7
* | | | | Merge branch 'zj-commit-raw-diffs' into 'master'Douwe Maan2018-06-221-7/+3
|\ \ \ \ \
| * | | | | Raw diffs are served from Gitalyzj-commit-raw-diffsZeger-Jan van de Weg2018-06-221-7/+3
* | | | | | Merge branch 'unify-admin_groups_spec.rb' into 'master'Douwe Maan2018-06-221-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Bring changes from EELin Jen-Shin2018-06-221-0/+1
* | | | | | Merge branch 'fix-boards-issue-highlight' into 'master'Clement Ho2018-06-222-4/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix boards issue highlightGeorge Tsiolis2018-06-212-4/+5
* | | | | | Merge branch 'rs-lib-gitlab-git-gitlab_projects-parity' into 'master'Robert Speicher2018-06-221-12/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | CE-EE parity for lib/gitlab/git/gitlab_projects.rbrs-lib-gitlab-git-gitlab_projects-parityRobert Speicher2018-06-201-12/+13
* | | | | | 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
| | |_|_|/ / / / / / / | |/| | | | | | | | |