summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Merge branch 'fix-conflicts-exception-for-submodules' into 'master'11-1-stable-prepare-rc7Rémy Coutable2018-07-114-15/+31
| | | | | Make sure ConflictsService does not raise for conflicting submodules See merge request gitlab-org/gitlab-ce!20528
* Merge branch 'sh-fix-git-gc-error-handling' into 'master'Robert Speicher2018-07-112-2/+8
| | | | | | | Fix ArgumentError in GitGarbageCollectWorker Sidekiq job Closes #49096 See merge request gitlab-org/gitlab-ce!20541
* Merge branch '48960-namespace-diff-module' into 'master'Tim Zallmann2018-07-1012-13/+18
| | | | | | | Resolve "Use namespaped module for diffs" Closes #48960 See merge request gitlab-org/gitlab-ce!20442
* Merge branch ↵Sean McGivern2018-07-101-2/+2
| | | | | | | | | '48970-markdown-wiki-help-incorrect-in-how-wiki-pages-are-rendered' into 'master' Resolve "Markdown help incorrect in how wiki pages are rendered" Closes #48970 See merge request gitlab-org/gitlab-ce!20459
* Merge branch '48982-mr-refactor-improve-performance-by-setting-v-once' into ↵Fatih Acet2018-07-105-29/+20
| | | | | | | | | 'master' Resolve "MR Refactor: Improve performance by setting v-once" Closes #48982 See merge request gitlab-org/gitlab-ce!20468
* Merge branch '48951-clean-up' into 'master'Phil Hughes2018-07-105-66/+56
| | | | | | | Resolve "MR refactor: All actions under diff module are being exported twice" Closes #48951 See merge request gitlab-org/gitlab-ce!20499
* Merge branch 'rjh/doc-update-for-gitlab-pages' into 'master'Rémy Coutable2018-07-102-5/+31
| | | | | Document update for GitLab Pages users. See merge request gitlab-org/gitlab-ce!20412
* Merge branch 'use-correct-script-location' into 'master'Rémy Coutable2018-07-101-1/+1
| | | | | Use the correct script location for the build trigger script See merge request gitlab-org/gitlab-ce!20454
* Merge branch 'revert-3755d828' into 'master'Phil Hughes2018-07-103-3/+3
| | | | | Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'" See merge request gitlab-org/gitlab-ce!20525
* Merge branch 'docs/codequality' into 'master'Marcia Ramos2018-07-105-53/+59
| | | | | Rename code climate to code quality See merge request gitlab-org/gitlab-ce!20506
* Update VERSION to 11.1.0-rc6v11.1.0-rc6GitLab Release Tools Bot2018-07-091-1/+1
|
* Merge branch 'jprovazn-upload-symlink' into 'master'Kamil Trzciński2018-07-094-3/+36
| | | | | | | Add FileUploader.root to allowed upload paths Closes gitlab-qa#291 See merge request gitlab-org/gitlab-ce!20472
* Merge branch '48978-fix-helm-installation-on-cluster' into 'master'Kamil Trzciński2018-07-093-2/+7
| | | | | | | Resolve "Installing Helm Tiller Failing" Closes #48978 See merge request gitlab-org/gitlab-ce!20471
* Merge branch 'docs-update-version-for-variables' into 'master'Marcia Ramos2018-07-091-2/+2
| | | | | updates version for CI_JOB_URL and CI_PIPELINE_URL to 11.1 See merge request gitlab-org/gitlab-ce!20450
* Merge branch 'docs/kubernetes-tiller' into 'master'Marcia Ramos2018-07-091-0/+7
| | | | | Add note about the k8s namespace of installed applications See merge request gitlab-org/gitlab-ce!20423
* Merge branch ↵Fatih Acet2018-07-091-2/+2
| | | | | | | | | '48897-mr-refactor-parallel-and-diff-view-are-being-rendered-at-the-same-time' into 'master' Resolve "MR refactor: parallel and diff view are being rendered at the same time" Closes #48897 See merge request gitlab-org/gitlab-ce!20440
* Merge branch '48906-adding-a-diff-line-note-freezes-the-browser' into 'master'Fatih Acet2018-07-093-4/+12
| | | | | | | Resolve "Adding a diff line note freezes the browser" Closes #48906 See merge request gitlab-org/gitlab-ce!20476
* Merge branch '19468-doc_add_readme_when_creating_project' into 'master'Douwe Maan2018-07-092-0/+3
| | | | | | | Update doc on new option to add README when creating a project Closes #19468 See merge request gitlab-org/gitlab-ce!20438
* Merge branch ↵Tim Zallmann2018-07-091-2/+2
| | | | | | | | | '49007-sast-fails-with-syntaxerror-in-scripts-frontend-prettier-js-return-outside-of-function-52-4' into 'master' Remove return statements from prettier script Closes #49007 See merge request gitlab-org/gitlab-ce!20488
* Merge branch '48898-mr-refactor-performance-costs-of-main-element-with-v-if' ↵Filipa Lacerda2018-07-097-33/+61
| | | | | | | | | into 'master' Resolve "MR refactor: Performance costs of main element with `v-if`" Closes #48898 See merge request gitlab-org/gitlab-ce!20463
* Merge branch '11-1-update-licenses' into 'master'James Lopez2018-07-091-45/+39
| | | | | [11.1.0] Update the dependencies license list See merge request gitlab-org/gitlab-ce!20487
* Merge branch '11-1-update-templates' into 'master'James Lopez2018-07-0925-37/+86
| | | | | [11.1.0] Update .gitignore, .gitlab-ci.yml, and Dockerfile templates See merge request gitlab-org/gitlab-ce!20486
* Merge commit '96eb6fd33b5dfc4910d8bd93e697d6b6eb70b991' into ↵Alessio Caiazza2018-07-09261-2831/+5939
|\ | | | | | | 11-1-stable-prepare-rc6
| * Merge branch 'test-basic-import' into 'master'Stan Hu2018-07-071-0/+0
| |\ | | | | | | | | | | | | Add basic export to fix timeout problem on import_file_spec.rb See merge request gitlab-org/gitlab-ce!20469
| | * add basic export to fix timeout problem on import_file_spec.rbJames Lopez2018-07-071-0/+0
| |/
| * Merge branch 'perf-wiki-pattern-once' into 'master'Stan Hu2018-07-072-3/+13
| |\ | | | | | | | | | | | | Improve render performance of large wiki pages See merge request gitlab-org/gitlab-ce!20465
| | * Add changelog entry for !20465Peter Leitzen2018-07-071-0/+5
| | | | | | | | | | | | [ci skip]
| | * Improve render performance of large wiki pagesPeter Leitzen2018-07-071-3/+8
| |/ | | | | | | | | | | Compile often used regexps only once outside of the loop. This commit improves the performance of large wiki pages with many, many references.
| * Merge branch ↵Tim Zallmann2018-07-073-4/+9
| |\ | | | | | | | | | | | | | | | | | | | | | | | | '48661-node-6-and-7-compatibility-broken-by-recent-monaco-editor-upgrade' into 'master' Resolve "Node 6 and 7 compatibility broken by recent Monaco editor upgrade" Closes #48661 See merge request gitlab-org/gitlab-ce!20461
View Lorry Controller Status