summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
* | Update VERSION to 11.1.0-rc12v11.1.0-rc12GitLab Release Tools Bot2018-07-171-1/+1
| |
* | Merge branch 'sh-fix-issue-49133-11-1-stable' into 'security-11-1'Dmitriy Zaporozhets2018-07-173-1/+14
|/ | | | | Fix symlink vulnerability in project import See merge request gitlab/gitlabhq!2435
* Update VERSION to 11.1.0-rc11v11.1.0-rc11GitLab Release Tools Bot2018-07-161-1/+1
|
* Merge branch 'mk/fix-flaky-protected-branch-expectations' into 'master'Rémy Coutable2018-07-165-44/+3
| | | | | | | QA: Remove flaky and redundant expectations Closes #49164 See merge request gitlab-org/gitlab-ce!20616
* Merge branch '48894-fix-rss-button-interaction' into 'master'Annabel Gray2018-07-166-5/+16
| | | | | | | Fix RSS button interaction on Dashboard, Project and Group activities Closes #48894 See merge request gitlab-org/gitlab-ce!20549
* Merge branch 'an/no-healthcheck-until-brooklyn' into 'master'Robert Speicher2018-07-163-64/+11
| | | | | | | Remove healthchecks from prometheus endpoint Closes #49112 See merge request gitlab-org/gitlab-ce!20565
* Merge branch 'gitaly-serverservice-info-timeout' into 'master'11-1-stable-prepare-rc11Rémy Coutable2018-07-133-2/+7
| | | | | | | Add a fast_timeout for the `ServerService.ServerInfo` endpoint Closes #49116 See merge request gitlab-org/gitlab-ce!20552
* Update VERSION to 11.1.0-rc10v11.1.0-rc10GitLab Release Tools Bot2018-07-131-1/+1
|
* Merge branch 'fix-performance-problem-of-tags-query' into 'master'11-1-stable-prepare-rc10Yorick Peterse2018-07-122-4/+16
| | | | | | | Fix performance problem of tags query Closes gitlab-com/infrastructure#4550 See merge request gitlab-org/gitlab-ce!20555
* Merge branch 'backport-widget-changes' into 'master'Filipa Lacerda2018-07-123-2/+6
| | | | | Backport mr widget changes from EE See merge request gitlab-org/gitlab-ce!20598
* Merge branch ↵Grzegorz Bizon2018-07-121-0/+4
| | | | | | | | | | '49021-preserve-test-run-artifacts-when-running-gitlab-qa-multiple-times' into 'master' Resolve "Preserve test run artifacts when running gitlab-qa multiple times" Closes #49021 See merge request gitlab-org/gitlab-ce!20495
* Merge branch '48789-remove-event-listeners-scroll' into 'master'Phil Hughes2018-07-127-84/+27
| | | | | | | Resolve "Improve performance of MR Changes tab: reduce event listeners on scroll event" Closes #48639 and #48789 See merge request gitlab-org/gitlab-ce!20558
* Merge branch '48241-fix-invalid-byte-sequence-in-qa' into 'master'Grzegorz Bizon2018-07-121-0/+2
| | | | | | | Resolve "QA: False failure on QA test "Push to protected branch when allowed" during staging failover rehearsal" Closes #48241 See merge request gitlab-org/gitlab-ce!20561
* Merge branch 'qa-fix-timestamp' into 'master'Grzegorz Bizon2018-07-121-1/+1
| | | | | | [QA] Fix duplicate year in namespace name See merge request gitlab-org/gitlab-ce!20581
* Merge branch 'fix-11-1-stable-gitaly-0.11.1' into '11-1-stable-prepare-rc10'Jose Ivan Vargas2018-07-121-1/+1
|\ | | | | | | | | Use Gitaly 0.111.1 in 11-1-stable See merge request gitlab-org/gitlab-ce!20590
| * Use Gitaly 0.111.1fix-11-1-stable-gitaly-0.11.1Jacob Vosmaer2018-07-121-1/+1
| |
* | Update VERSION to 11.1.0-rc9v11.1.0-rc9GitLab Release Tools Bot2018-07-121-1/+1
| |
* | Merge branch 'fix-mr-widget-border' into 'master'Filipa Lacerda2018-07-122-7/+1
|/ | | | | Fix MR widget border See merge request gitlab-org/gitlab-ce!20562
* Update VERSION to 11.1.0-rc8v11.1.0-rc811-1-stable-prepare-rc9GitLab Release Tools Bot2018-07-111-1/+1
|
* Merge branch 'revert-todos-epic' into 'master'11-1-stable-prepare-rc8Yorick Peterse2018-07-1130-640/+184
| | | | | Revert "Merge branch 'ee-5481-epic-todos' into 'master'" See merge request gitlab-org/gitlab-ce!20560
* Merge branch '48237-toggle-file-comments' into 'master'Phil Hughes2018-07-1114-92/+378
| | | | | | | Resolve "Toggle file comments in merge request does not update toggle buttons" Closes #48237 and #48537 See merge request gitlab-org/gitlab-ce!20452
* Merge branch 'docs/cluster-permissions' into 'master'Marcia Ramos2018-07-111-2/+3
| | | | | | | Mention admin privileges for k8s token creation Closes #44457 See merge request gitlab-org/gitlab-ce!20517
* Update VERSION to 11.1.0-rc7v11.1.0-rc7GitLab Release Tools Bot2018-07-111-1/+1
|
View Lorry Controller Status