summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Support append/truncate for fog storebuild-chunks-on-object-storageShinya Maeda2018-06-252-11/+32
|
* Add specs for each data storeShinya Maeda2018-06-254-0/+441
|
* Enable specs for atomic operationsShinya Maeda2018-06-251-65/+87
|
* Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-06-25876-5224/+13255
|\
| * 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 exception See merge request gitlab-org/gitlab-ce!20085
| | * 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
| |\ \ | | | | | | | | | | | | | | | | Minor fixes for the Helm docs See merge request gitlab-org/gitlab-ce!20078
| | * | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove top padding on GPG popovers" Closes #48296 See merge request gitlab-org/gitlab-ce!20110
| | * | | 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-3760 See merge request gitlab-org/gitlab-ce!20109
| | * | | | 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
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | Unify spec/support/matchers/match_ids.rb See merge request gitlab-org/gitlab-ce!20108
| | * | | | 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 Gitaly Closes gitaly#222 See merge request gitlab-org/gitlab-ce!20091
| | * | | | | Raw diffs are served from Gitalyzj-commit-raw-diffsZeger-Jan van de Weg2018-06-221-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/222
| * | | | | | Merge branch 'unify-admin_groups_spec.rb' into 'master'Douwe Maan2018-06-221-0/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Unify spec/features/admin/admin_groups_spec.rb See merge request gitlab-org/gitlab-ce!20107
| | * | | | | 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 highlight Closes #48068 See merge request gitlab-org/gitlab-ce!20063
| | * | | | | 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.rb See merge request gitlab-org/gitlab-ce!20047
| | * | | | | 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" See merge request gitlab-org/gitlab-ce!19917
| | * | | | | | [Rails5] Fix "'-1' is not a valid data_store"blackst0ne-rails5-fix-data-store-specblackst0ne2018-06-162-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19882
| * | | | | | | Merge branch 'patch-29' into 'master'Kamil Trzciński2018-06-221-26/+26
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update lfs_administration.md with language edits See merge request gitlab-org/gitlab-ce!19950
| | * | | | | | | Update lfs_administration.md with language editsMarcel Amirault2018-06-181-26/+26
| | | | | | | | |
| * | | | | | | | Merge branch ↵Kamil Trzciński2018-06-221-13/+82
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'docs/sm/trouble-shooting-guid-for-timeout-of-background-upload' into 'master' Add troubleshooting guide for lfs uploading timeouts See merge request gitlab-org/gitlab-ce!19949
| | * | | | | | | 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 mandatory Closes gitaly#221 See merge request gitlab-org/gitlab-ce!20090
| | * | | | | | | | FindRefName RPC now mandatoryzj-find-ref-nameZeger-Jan van de Weg2018-06-221-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Has never been in OPT_OUT, dispite being ages old. The time where feature flags are still set by env vars. Closes https://gitlab.com/gitlab-org/gitaly/issues/221
| * | | | | | | | | Merge branch 'docs-add-inline-badges-autodevops' into 'master'Achilleas Pipinellis2018-06-221-6/+6
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: add inline badges to Auto DevOps features list See merge request gitlab-org/gitlab-ce!20096
| | * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disallow methods that copy data on large tables See merge request gitlab-org/gitlab-ce!20021
| | * | | | | | | | | Add more large tables to copupdate-large-tables-copSean McGivern2018-06-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are all over 20 GB on GitLab.com. merge_request_diff_commits is several hundred gigabytes in size.
| | * | | | | | | | | Disallow methods that copy data on large tablesSean McGivern2018-06-192-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | {change_column_type,rename_column}_concurrently both copy data from one column to another during a migration, which should not be done on GitLab.com. Instead, we should use background migrations.
| * | | | | | | | | | Merge branch 'bjk/48176_ruby_gc' into 'master'Yorick Peterse2018-06-224-13/+34
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ruby sampler metrics See merge request gitlab-org/gitlab-ce!20039
| | * | | | | | | | | | Cleanup ruby sampler metricsbjk/48176_ruby_gcBen Kochie2018-06-224-13/+34
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use a simple counter for sampler duration instead of a histogram. * Use a counter to collect GC time. * Remove unused objects metric. * Cleanup metric names to match Prometheus conventions. * Prefix generic GC stats with `gc_stat`. * Include worker label on memory and file descriptor metrics.
| * | | | | | | | | | Merge branch 'zj-repository-size' into 'master'Douwe Maan2018-06-221-15/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repository size is Gitaly only Closes gitaly#393 See merge request gitlab-org/gitlab-ce!20089
| | * | | | | | | | | | Repository size is Gitaly onlyzj-repository-sizeZeger-Jan van de Weg2018-06-221-15/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/393
| * | | | | | | | | | | Merge branch 'unify-filter_issues_spec.rb' into 'master'Nick Thomas2018-06-221-2/+34
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify spec/features/issues/filtered_search/filter_issues_spec.rb See merge request gitlab-org/gitlab-ce!20070
| | * | | | | | | | | | | 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 Closes #48094 See merge request gitlab-org/gitlab-ce!20064
| | * | | | | | | | | | | 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 description See merge request gitlab-org/gitlab-ce!20093