summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Enable frozen string in apps/validators/*.rbgfyoung2018-06-2720-2/+45
| | | | Partially addresses #47424.
* Merge branch 'gitaly-storage-validation' into 'master'Rémy Coutable2018-06-274-72/+2
|\ | | | | | | | | | | | | Migrate storage nesting check to Gitaly Closes gitaly#1237 See merge request gitlab-org/gitlab-ce!20208
| * Migrate storage nesting check to GitalyJacob Vosmaer (GitLab)2018-06-274-72/+2
|/
* Merge branch 'hashed-storage-rollback-docs' into 'master'Nick Thomas2018-06-271-2/+66
|\ | | | | | | | | Improve Hashed Storage documentation for rollback See merge request gitlab-org/gitlab-ce!20203
| * Improve Hashed Storage documentation for rollbackGabriel Mazetto2018-06-271-2/+66
| | | | | | | | | | Fixed storage coverage table with additional information and wrote down implementationd details from few entities.
* | Merge branch 'fl-tech-debt' into 'master'Phil Hughes2018-06-2711-673/+686
|\ \ | | | | | | | | | | | | Moves boards components into a .vue file See merge request gitlab-org/gitlab-ce!20177
| * | Moves boards components into a .vue filefl-tech-debtFilipa Lacerda2018-06-2611-673/+686
| | |
* | | Merge branch 'doc-exception-request-links' into 'master'Marin Jankovski2018-06-271-18/+1
|\ \ \ | | | | | | | | | | | | | | | | Updates exception request documentation to link to the new location See merge request gitlab-org/gitlab-ce!20207
| * | | Updates exception request documentation to link to the new locationFilipa Lacerda2018-06-271-18/+1
| | | |
* | | | Merge branch 'zj-gitaly-read-write-check' into 'master'Nick Thomas2018-06-2715-393/+81
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly metrics check for read/writeability Closes gitaly#1218 See merge request gitlab-org/gitlab-ce!20022
| * | | | Gitaly metrics check for read/writeabilityZeger-Jan van de Weg2018-06-2715-393/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, health checks checked for writeability of the NFS shards. Given we're moving away from that, this patch extends the checks for Gitaly to check for read and writeability. Potentially some dashboards will break, as over time these metrics will no longer appear as Prometheus doesn't get the data anymore. Observability in the circuit breaker will be reduced, but its not expected to be turned on and the circuit breaker is being removed soon too. Closes https://gitlab.com/gitlab-org/gitaly/issues/1218
* | | | | Merge branch '48528-fix-mr-autocompletion' into 'master'Sean McGivern2018-06-273-2/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "`!` autocomplete does not work anymore" Closes #48528 See merge request gitlab-org/gitlab-ce!20204
| * | | | | Add changelog entryKushal Pandya2018-06-271-0/+5
| | | | | |
| * | | | | Fix merge requests data source key to be camelCaseKushal Pandya2018-06-272-2/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'frozen-string-enable-app-workers-2' into 'master'Rémy Coutable2018-06-2724-0/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable frozen string for app/workers/**/*.rb See merge request gitlab-org/gitlab-ce!20197
| * | | | | Enable frozen string for app/workers/**/*.rbgfyoung2018-06-2724-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | Partially addresses #47424.
* | | | | | Merge branch ↵Phil Hughes2018-06-274-61/+61
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '46546-do-not-pre-select-previous-user-s-when-creating-protected-branches' into 'master' CE port gitlab-ee!6112 Closes #46546 See merge request gitlab-org/gitlab-ce!19714
| * | | | | CE port gitlab-ee!6112Luke Bennett2018-06-274-61/+61
|/ / / / /
* | | | | Merge branch 'rs-spec-models-parity' into 'master'Rémy Coutable2018-06-271-7/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE-EE parity for spec/models See merge request gitlab-org/gitlab-ce!20165
| * | | | | CE-EE parity for spec/models/repository_spec.rbrs-spec-models-parityRobert Speicher2018-06-251-7/+29
| | | | | |
* | | | | | Merge branch 'gitaly-tree-entry-dot-dot' into 'master'Sean McGivern2018-06-273-49/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Client-side fix for Gitaly TreeEntry bug See merge request gitlab-org/gitlab-ce!20176
| * | | | | | Client-side fix for Gitaly TreeEntry buggitaly-tree-entry-dot-dotJacob Vosmaer2018-06-263-49/+30
| | | | | | |
* | | | | | | Merge branch '40484-copy-ordered-lists-gfm' into 'master'Phil Hughes2018-06-273-1/+74
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Copying ordered list to new comment becomes unordered" Closes #40484 See merge request gitlab-org/gitlab-ce!18522
| * | | | | | Resolve "Copying ordered list to new comment becomes unordered"Jan Beckmann2018-06-273-1/+74
|/ / / / / /
* | | | | | Merge branch 'frozen-string-app-workers' into 'master'Rémy Coutable2018-06-2787-9/+183
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable frozen string literals for app/workers/*.rb See merge request gitlab-org/gitlab-ce!19944
| * | | | | | Enable frozen string literals for app/workers/*.rbgfyoung2018-06-2787-9/+183
|/ / / / / /
* | | | | | Merge branch '48461-search-dropdown-hides-shows-when-typing' into 'master'Mike Greiling2018-06-272-3/+8
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Search dropdown hides & shows when typing" Closes #48461 See merge request gitlab-org/gitlab-ce!20187
| * | | | | Resolve "Search dropdown hides & shows when typing"Clement Ho2018-06-272-3/+8
|/ / / / /
* | | | | Merge branch 'acet-mr-diffs-autosave' into 'master'Tim Zallmann2018-06-263-2/+41
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement MR diff notes autosave feature Closes #48300 See merge request gitlab-org/gitlab-ce!20114
| * | | | | Use refs instead of querySelector.Fatih Acet2018-06-261-2/+2
| | | | | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet2018-06-26223-1593/+2764
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | acet-mr-diffs-autosave
| * | | | | | Implement MR diff notes autosave feature.acet-mr-diffs-autosaveFatih Acet2018-06-223-2/+41
| | | | | | |
* | | | | | | Merge branch 'revert-merge-request-widget-button-height' into 'master'Clement Ho2018-06-262-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert merge request widget button max height Closes #48441 See merge request gitlab-org/gitlab-ce!20175
| * | | | | | | Revert merge request widget button max heightGeorge Tsiolis2018-06-262-1/+5
| | | | | | | |
* | | | | | | | Merge branch 'update-external-link-icon-in-header-user-dropdown' into 'master'Clement Ho2018-06-263-1/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update external link icon in header user dropdown See merge request gitlab-org/gitlab-ce!20150
| * | | | | | | | Update external link icon in header user dropdownGeorge Tsiolis2018-06-263-1/+10
| |/ / / / / / /
* | | | | | | | Update CHANGELOG.md for 11.0.2GitLab Release Tools Bot2018-06-2611-50/+22
|/ / / / / / / | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'tz-mr-vue-imagediff' into 'master'Clement Ho2018-06-2615-39/+178
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Added Diff Viewer to new VUE based MR page See merge request gitlab-org/gitlab-ce!20131
| * | | | | | Added Diff Viewer to new VUE based MR pageTim Zallmann2018-06-2615-39/+178
|/ / / / / /
* | | | | | Merge branch ↵Robert Speicher2018-06-261-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '48243-qa-deploy-key-cloning-test-sometimes-can-t-find-the-qa-element' into 'master' Resolve "QA: Deploy key cloning test sometimes can't find the QA element" Closes #48243 See merge request gitlab-org/gitlab-ce!20181
| * | | | | | [QA] Make sure we wait for the deploy key list to loadRémy Coutable2018-06-261-0/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'eslint-fix' into 'master'Filipa Lacerda2018-06-261-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed eslint failure in IDE spec helpers Closes #48490 See merge request gitlab-org/gitlab-ce!20182
| * | | | | | Fixed eslint failure in IDE spec helpersPhil Hughes2018-06-261-2/+2
|/ / / / / /
* | | | | | Merge branch '45703-open-web-ide-file-tree' into 'master'Phil Hughes2018-06-267-8/+117
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show file in tree on WebIDE open Closes #45703 See merge request gitlab-org/gitlab-ce!19887
| * | | | | | Show file in tree on WebIDE openPaul Slaughter2018-06-267-8/+117
|/ / / / / /
* | | | | | Merge branch '47794-environment-scope-cluster-page' into 'master'Mike Greiling2018-06-262-14/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update environment scope for starter/core plans on cluster page" Closes #47794 See merge request gitlab-org/gitlab-ce!20166
| * | | | | | 47794 Change environment scope text depending on number of project clusters. ↵47794-environment-scope-cluster-pagetauriedavis2018-06-252-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update form to only include form-groups
* | | | | | | Merge branch 'avatar-upload' into 'master'Mike Greiling2018-06-262-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugfix for #48378 - Resetting value of input element to fix Chrome-specific issue See merge request gitlab-org/gitlab-ce!20161
| * | | | | | | Bugfix for #48378 - Resetting value of input element to fix Chrome-specific ↵Chirag Bhatia2018-06-262-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue
* | | | | | | | Merge branch 'ce-update-branch-client-preparation' into 'master'Robert Speicher2018-06-261-2/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move git calls for `Repository#update_branch` inside Gitlab::Git See merge request gitlab-org/gitlab-ce!20168