summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 11.1.4v11.1.4GitLab Release Tools Bot2018-07-301-1/+1
|
* Update CHANGELOG.md for 11.1.4GitLab Release Tools Bot2018-07-301-0/+4
| | | [ci skip]
* Merge branch '11-1-stable-patch-4' into '11-1-stable'Jose Ivan Vargas2018-07-3037-800/+247
|\ | | | | | | | | Prepare 11.1.4 release See merge request gitlab-org/gitlab-ce!20907
| * Merge branch 'docs/zj-remove-fs-shard-check' into 'master'Stan Hu2018-07-301-9/+0
| | | | | | | | | | | | | | Remove references to FS Shard check from the docs Closes #49725 See merge request gitlab-org/gitlab-ce!20897
| * Revert "Merge branch '11-1-3-stable-fixes-mr-refactor-regressions' into ↵Alessio Caiazza2018-07-3036-791/+247
|/ | | | | | | '11-1-stable-patch-3'" This reverts commit 0cf823558887aaf2ad041473ed9961755d5d5f3b, reversing changes made to 923b26133b8d04e8c4da4183b8f0382eefcc8147.
* Update VERSION to 11.1.3v11.1.3GitLab Release Tools Bot2018-07-271-1/+1
|
* Update CHANGELOG.md for 11.1.3GitLab Release Tools Bot2018-07-2710-45/+18
| | | [ci skip]
* Merge branch '11-1-3-stable-fixes-mr-refactor-regressions' into ↵11-1-stable-patch-3Felipe Artur2018-07-2741-247/+816
|\ | | | | | | | | | | | | '11-1-stable-patch-3' MR refactor fixes for 11.1.3 See merge request gitlab-org/gitlab-ce!20878
| * Merge branch 'tz-mr-refactor-mem-posting' into 'master'11-1-x-MR-improvements11-1-3-stable-fixes-mr-refactor-regressionsFatih Acet2018-07-244-31/+18
| | | | | | | | | | Improving performance of posting a comment by reducing memory + CPU See merge request gitlab-org/gitlab-ce!20779
| * Merge branch 'tz-mr-refactor-memory-reduction' into 'master'Fatih Acet2018-07-2311-94/+149
| | | | | | | | | | Reducing the memory footprint for the rendering See merge request gitlab-org/gitlab-ce!20744
| * Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master'Filipa Lacerda2018-07-2311-68/+412
| | | | | | | | | | | | | | Resolve ""Jump to first/next unresolved discussion" jumps to resolved discussions" Closes #48817 and #48602 See merge request gitlab-org/gitlab-ce!20434
| * Merge branch '_acet-fix-mr-autosave' into 'master'Tim Zallmann2018-07-2310-50/+106
| | | | | | | | | | | | | | Fix autosave issues for MR discussions Closes #48876 and #48877 See merge request gitlab-org/gitlab-ce!20569
| * Merge branch '_acet-fix-expanding-context-lines' into 'master'Tim Zallmann2018-07-234-4/+5
| | | | | | | | | | | | | | Fix rendering context lines on MR diffs Closes #49242 and #49343 See merge request gitlab-org/gitlab-ce!20642
| * Merge branch '_acet-fix-outdated-discussions' into 'master'Tim Zallmann2018-07-2315-20/+146
| | | | | | | | | | | | | | Fix showing outdated discussions on Changes tab. Closes #48167 See merge request gitlab-org/gitlab-ce!20445
* | Merge branch 'feature/add-docs-to-disable-listener' into 'master'Achilleas Pipinellis2018-07-271-23/+21
| | | | | | | | | | Add docs to disable proxy listener See merge request gitlab-org/gitlab-ce!19734
* | Merge branch '4525-fix-project-indexes' into 'master'Yorick Peterse2018-07-273-0/+29
| | | | | | | | | | Improve projects indexes See merge request gitlab-org/gitlab-ce!20377
* | Merge branch 'revert-aeb3df17' into 'master'Achilleas Pipinellis2018-07-271-38/+0
| | | | | | | | | | Revert "Merge branch '2211-add-option-to-change-clone-path-docs' into 'master'" See merge request gitlab-org/gitlab-ce!20633
* | Merge branch 'project-dropdown-list-overflow' into 'master'Phil Hughes2018-07-272-5/+7
| | | | | | | | | | | | | | Don't overflow project/group dropdown results Closes #49382 and #49379 See merge request gitlab-org/gitlab-ce!20704
* | Merge branch 'ide-edit-json-files' into 'master'Tim Zallmann2018-07-273-2/+24
| | | | | | | | | | Fixed IDE not opening JSON files See merge request gitlab-org/gitlab-ce!20798
* | Merge branch 'zj-backup-timeout' into 'master'Rémy Coutable2018-07-273-4/+13
| | | | | | | | | | Remove timeouts for long running requests See merge request gitlab-org/gitlab-ce!20810
* | Merge branch 'gitlab-qa-reset-local-store' into 'master'Rémy Coutable2018-07-271-0/+1
| | | | | | | | | | | | | | Reset local storage between qa tests Closes gitlab-qa#303 See merge request gitlab-org/gitlab-ce!20844
* | Update VERSION to 11.1.2v11.1.2GitLab Release Tools Bot2018-07-261-1/+1
| |
* | Update CHANGELOG.md for 11.1.2GitLab Release Tools Bot2018-07-267-30/+18
| | | | | | [ci skip]
* | Merge branch 'sh-revert-markdown-changes' into 'master'Robert Speicher2018-07-253-1/+18
| | | | | | | | | | | | | | Fix slow Markdown rendering Closes #49409 See merge request gitlab-org/gitlab-ce!20820
* | Merge branch 'security-11-1-48617-promoting-milestone' into 'security-11-1'Alessio Caiazza2018-07-245-2/+41
| | | | | | | | | | [11.1] Escapes milestone title shown in flash message when promoting a milestone See merge request gitlab/gitlabhq!2443
* | Merge branch 'security-ide-branch-name-xss-11-1' into 'security-11-1'Felipe Artur Cardozo2018-07-243-1/+15
| | | | | | | | | | [11.1] Fixed XSS in branch name in Web IDE See merge request gitlab/gitlabhq!2446
* | Merge branch 'security-11-1-2690-fix-tooltip' into 'security-11-1'Alessio Caiazza2018-07-2412-38/+195
| | | | | | | | | | [11.1] Escapes job name used in tooltips in vue components See merge request gitlab/gitlabhq!2428
* | Merge branch 'security-fj-missing-csrf-system-hooks-11-1' into 'security-11-1'Felipe Artur Cardozo2018-07-246-5/+10
| | | | | | | | | | [11.1] Missing CSRF in System Hooks See merge request gitlab/gitlabhq!2444
* | Merge branch 'security-event-counters-private-data-11-1' into 'security-11-1'Felipe Artur Cardozo2018-07-2419-38/+20
|/ | | | | [11.1] Don't expose project names in various counters See merge request gitlab/gitlabhq!2445
* Update VERSION to 11.1.1v11.1.1GitLab Release Tools Bot2018-07-231-1/+1
|
* Update CHANGELOG.md for 11.1.1GitLab Release Tools Bot2018-07-234-15/+12
| | | [ci skip]
* Merge remote-tracking branch 'origin/gitaly-0.111.2' into 11-1-stable-patch-111-1-stable-patch-1Alessio Caiazza2018-07-231-1/+1
|\
| * Use Gitaly 0.111.2gitaly-0.111.2Jacob Vosmaer2018-07-201-1/+1
| |
* | Merge branch 'update-mr-img-docs' into 'master'Mike Lewis2018-07-231-0/+0
| | | | | | | | | | Update merge_request.png in docs See merge request gitlab-org/gitlab-ce!20730
* | Merge branch 'milestones-update-docs' into 'master'Mike Lewis2018-07-233-0/+0
| | | | | | | | | | Update docs milestones See merge request gitlab-org/gitlab-ce!20731
* | Merge branch ↵Sean McGivern2018-07-2312-25/+244
| | | | | | | | | | | | | | | | | | '48745-project-exports-fail-when-uploads-have-been-migrated-to-object-storage' into 'master' Resolve "Project exports fail when uploads have been migrated to object storage" Closes #48745 See merge request gitlab-org/gitlab-ce!20484
* | Merge branch 'gitaly-ff-branch-nil' into 'master'Rémy Coutable2018-07-234-11/+141
| | | | | | | | | | | | | | Add missing Gitaly branch_update nil checks Closes #49263 See merge request gitlab-org/gitlab-ce!20711
* | Merge branch 'jprovazn-fix-filename' into 'master'Kamil Trzciński2018-07-235-18/+86
|/ | | | | Fix filename for accelerated uploads See merge request gitlab-org/gitlab-ce!20672
* Update VERSION to 11.1.0v11.1.0GitLab Release Tools Bot2018-07-201-1/+1
|
* Update CHANGELOG.md for 11.1.0GitLab Release Tools Bot2018-07-20213-1080/+239
| | | [ci skip]
* Update VERSION to 11.1.0-rc14v11.1.0-rc14GitLab Release Tools Bot2018-07-181-1/+1
|
* Merge branch 'osw-fallback-to-collection-when-no-diff-refs' into 'master'11-1-stable-prepare-rc14Sean McGivern2018-07-184-1/+31
| | | | | | | Render MR page when no persisted diff_refs or diffs size Closes #49342 See merge request gitlab-org/gitlab-ce!20680
* Update VERSION to 11.1.0-rc13v11.1.0-rc13GitLab Release Tools Bot2018-07-181-1/+1
|
* Merge branch '11-1-stable-prepare-rc13' into 11-1-stableFelipe Artur2018-07-1738-225/+417
|\
| * Merge branch '48964-mr-reduce-the-memory-footprint-of-the-component-tree' ↵11-1-stable-prepare-rc13Fatih Acet2018-07-1718-145/+170
| | | | | | | | | | | | | | | | | | into 'master' Resolve "MR: Reduce the memory footprint of the component tree" Closes #48964 See merge request gitlab-org/gitlab-ce!20448
| * Merge branch ↵Clement Ho2018-07-173-3/+30
| | | | | | | | | | | | | | | | | | '49257-metrics-drop-down-doesn-t-show-all-environment-some-not-clickable' into 'master' Resolve "Metrics drop down doesn't show all environment, some not clickable" Closes #49257 See merge request gitlab-org/gitlab-ce!20651
| * Merge branch ↵Annabel Gray2018-07-172-1/+3
| | | | | | | | | | | | | | | | | | '49165-pipeline-graph-in-new-merge-request-widget-is-flickering' into 'master' Resolve "Pipeline graph in new merge request widget is flickering" Closes #49165 See merge request gitlab-org/gitlab-ce!20660
| * Merge branch '48578-disable-gcp-free-credit-banner-at-instance-level' into ↵Rémy Coutable2018-07-1712-58/+201
| | | | | | | | | | | | | | | | | | | | '11-1-prepare-rc3' Resolve "Disable GCP free credit banner at instance level" Closes #48578 See merge request gitlab-org/gitlab-ce!20379
| * Merge branch '49061-submodule-helper-fix' into 'master'Sean McGivern2018-07-172-17/+12
| | | | | | | | | | | | | | Resolve "NoMethodError: undefined method `namespace' for nil:NilClass" Closes #49061 See merge request gitlab-org/gitlab-ce!20615
| * Merge branch 'set-build-token-CN' into 'master'Rémy Coutable2018-07-171-1/+1
| | | | | | | | | | | | | | Add the CI Job trigger as the build trigger Closes charts/gitlab#586 See merge request gitlab-org/gitlab-ce!20619
View Lorry Controller Status