summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 11.4.0v11.4.0GitLab Release Tools Bot2018-10-191-1/+1
|
* Update CHANGELOG.md for 11.4.0GitLab Release Tools Bot2018-10-19202-1017/+225
| | | [ci skip]
* Update VERSION to 11.4.0-rc8v11.4.0-rc8GitLab Release Tools Bot2018-10-181-1/+1
|
* Merge branch '11-4-stable-prepare-rc8' into '11-4-stable'Thiago Presa2018-10-186-1/+147
|\ | | | | | | | | Prepare 11.4 RC8 release See merge request gitlab-org/gitlab-ce!22452
| * Merge branch 'add/git-protocol-v2-docs' into 'master'Evan Read2018-10-182-0/+98
| | | | | | | | | | Add Git protocol v2 docs See merge request gitlab-org/gitlab-ce!22227
| * Merge branch 'ml-qa-code-owners' into 'master'Rémy Coutable2018-10-184-1/+49
|/ | | | | QA: Add support for pushing and viewing files See merge request gitlab-org/gitlab-ce!21911
* Update VERSION to 11.4.0-rc7v11.4.0-rc7GitLab Release Tools Bot2018-10-171-1/+1
|
* Merge branch '11-4-stable-prepare-rc7' into '11-4-stable'Steve Azzopardi2018-10-1720-53/+123
|\ | | | | | | | | Prepare 11.4 RC7 release See merge request gitlab-org/gitlab-ce!22392
| * Merge branch 'docs/fix-link-to-when-delayed' into 'master'Achilleas Pipinellis2018-10-163-2/+2
| | | | | | | | | | Fix link to 'when delayed' YAML configuration item See merge request gitlab-org/gitlab-ce!22349
| * Merge branch ↵Clement Ho2018-10-164-32/+6
| | | | | | | | | | | | | | | | | | | | '52532-unable-to-toggle-issuable-sidebar-out-of-collapsed-state' into 'master' Allow Issue and Merge Request sidebar to be toggled from collapsed state Closes #52532 See merge request gitlab-org/gitlab-ce!22353
| * Merge branch '52669-fixes-quick-actions-preview' into 'master'Douglas Barbosa Alexandre2018-10-164-2/+16
| | | | | | | | | | | | | | Fixes close/reopen quick actions preview for issues and merge_requests Closes #52669 See merge request gitlab-org/gitlab-ce!22343
| * Merge branch ↵Phil Hughes2018-10-166-15/+72
| | | | | | | | | | | | | | | | | | '52564-personal-projects-pagination-in-profile-overview-tab-is-broken' into 'master' Resolve "Personal projects pagination in Profile Overview tab is broken" Closes #52564 See merge request gitlab-org/gitlab-ce!22321
| * Merge branch '52614-bugs-on-deployment-status-in-job-log-page' into 'master'Grzegorz Bizon2018-10-162-1/+26
| | | | | | | | | | | | | | Send deployment_status when job starts environment Closes #52614 See merge request gitlab-org/gitlab-ce!22354
| * Merge branch 'gitaly-0.125.1' into 'master'James Lopez2018-10-161-1/+1
|/ | | | | Use Gitaly 0.125.1 See merge request gitlab-org/gitlab-ce!22364
* Update VERSION to 11.4.0-rc6v11.4.0-rc6GitLab Release Tools Bot2018-10-151-1/+1
|
* Fixed syntax issues in specs11-4-stable-prepare-rc6Jan Provaznik2018-10-154-6/+4
|
* Fixes conflicts for app/assets/javascripts/jobs/components/stages_dropdown.vueFilipa Lacerda2018-10-151-39/+5
|
* Fixes conflicts for app/assets/javascripts/jobs/components/sidebar.vueFilipa Lacerda2018-10-151-33/+1
|
* Merge branch '52608-sidebar' into 'master'Tim Zallmann2018-10-155-5/+49
| | | | | | | Hide job sidebar on mobile Closes #52608 See merge request gitlab-org/gitlab-ce!22314
* Merge branch '52618-incorrect-stage-being-shown-in-side-bar-of-job-view-api' ↵Tim Zallmann2018-10-1513-34/+128
| | | | | | | | | | into 'master' Add stage name in job.json response Closes #52618 See merge request gitlab-org/gitlab-ce!22317
* Merge branch '52614-update-job-started-check' into 'master'Tim Zallmann2018-10-154-9/+14
| | | | | Updates the check for started in job header See merge request gitlab-org/gitlab-ce!22329
* Merge branch 'docs-go1.10' into 'master'Marcia Ramos2018-10-151-2/+2
| | | | | | | Drop support for Go 1.9 in GitLab 11.4 Closes #51982 See merge request gitlab-org/gitlab-ce!22324
* Merge branch 'jr-merge-file-tree-docs' into 'master'Marcia Ramos2018-10-152-3/+3
| | | | | Update merge request diff navigation docs See merge request gitlab-org/gitlab-ce!22275
* Merge branch '52361-fix-file-tree-mobile' into 'master'Filipa Lacerda2018-10-155-4/+34
| | | | | | | Resolve "Make file browser hidden by default for mobile screens" and improve layout in small screens too Closes #52361 See merge request gitlab-org/gitlab-ce!22273
* Merge branch 'ce-7921-fix-batch-comments-resolution' into 'master'Phil Hughes2018-10-151-1/+13
| | | | | Backport CE changes for: Resolves "Reviews: Resolving or unresolving discussions with “Add comment now” does not work" See merge request gitlab-org/gitlab-ce!22303
* Update VERSION to 11.4.0-rc5v11.4.0-rc5Steve Azzopardi2018-10-121-1/+1
|
* Update VERSION to 11.4.0-rc4v11.4.0-rc411-4-stable-prepare-rc5Thiago Presa2018-10-111-1/+1
|
* Merge branch 'gt-remove-duplicate-button-from-the-md-header-toolbar' into ↵11-4-stable-prepare-rc4Clement Ho2018-10-112-2/+6
| | | | | | | 'master' Remove duplicate button from the markdown header toolbar See merge request gitlab-org/gitlab-ce!22192
* Merge branch 'gt-update-application-copy-secret-to-clipboard-data' into 'master'Annabel Dunstone Gray2018-10-113-2/+7
| | | | | | | Update copy to clipboard button data for application secret Closes #52572 See merge request gitlab-org/gitlab-ce!22268
* Merge branch ↵Clement Ho2018-10-111-1/+1
| | | | | | | | | '52103-dropzone-css-is-failing-to-load-on-rspec-dev-and-staging-11-4-0-rc' into 'master' Resolve "Dropzone css is failing to load on rspec, dev and staging 11.4.0 RC" Closes #52103 See merge request gitlab-org/gitlab-ce!22272
* Merge branch 'ml-qa-register-user-failure' into 'master'Rémy Coutable2018-10-114-23/+41
| | | | | QA: Retry registration before failing See merge request gitlab-org/gitlab-ce!22033
* Merge branch 'osw-remove-dead-code-on-mr-show' into 'master'Robert Speicher2018-10-114-29/+6
| | | | | | | Removes expensive dead code on main MR page request Closes #51172 See merge request gitlab-org/gitlab-ce!22153
* Merge branch 'sh-fix-project-deletion-with-export' into 'master'Robert Speicher2018-10-113-4/+26
| | | | | | | Fix project deletion when there is a export available Closes #52362 See merge request gitlab-org/gitlab-ce!22276
* Merge branch 'winh-delayed-jobs-docs' into 'master'Evan Read2018-10-113-0/+49
| | | | | | | Documentation for delayed jobs Closes #52127 See merge request gitlab-org/gitlab-ce!22117
* Merge branch '52519-runners-link' into 'master'Tim Zallmann2018-10-115-5/+12
| | | | | | | Stuck block URL links to runners settings Closes #52519 See merge request gitlab-org/gitlab-ce!22286
* Merge branch '52570-erased-block' into 'master'Mike Greiling2018-10-114-6/+23
| | | | | | | Fix erased block not being rendered when job was erased Closes #52570 See merge request gitlab-org/gitlab-ce!22294
* Merge branch '52472-pipeline-endpoint-json' into 'master'Tim Zallmann2018-10-113-3/+8
| | | | | | | Adds `.json` to the end of pipelines endpoint Closes #52472 See merge request gitlab-org/gitlab-ce!22293
* Update VERSION to 11.4.0-rc3v11.4.0-rc3GitLab Release Tools Bot2018-10-101-1/+1
|
* Merge branch 'sh-revert-pages-version' into 'master'Robert Speicher2018-10-101-1/+1
| | | | | Revert GitLab Pages version to v1.1.0 See merge request gitlab-org/gitlab-ce!22277
* Merge branch '11-4-stable-prepare-rc3' into '11-4-stable'Jan Provaznik2018-10-100-0/+0
|\ |/ | | | Prepare 11.4 RC3 release See merge request gitlab-org/gitlab-ce!22261
* Merge branch 'docs/add-note-for-interactive-web-terminal-docker-executor' ↵11-4-stable-prepare-rc3Achilleas Pipinellis2018-10-101-0/+6
| | | | | | | into 'master' Add note in docs for docker executor for interactive web terminal See merge request gitlab-org/gitlab-ce!21880
* Merge branch 'ml-qa-skip-signup-disabled' into 'master'Rémy Coutable2018-10-105-19/+55
| | | | | QA: Allow the registration e2e test to be skipped See merge request gitlab-org/gitlab-ce!22205
* Merge branch 'tpresa-update-install-docs-11-4' into 'master'Achilleas Pipinellis2018-10-103-3/+381
| | | | | Update installation and update docs for 11 4 See merge request gitlab-org/gitlab-ce!22030
* Merge branch ↵Mike Greiling2018-10-102-2/+2
| | | | | | | '52399-link-for-rbac-experimental-support-is-going-to-the-wrong-anchor' into 'master' Resolve "Link for RBAC (experimental support) is going to the wrong anchor" See merge request gitlab-org/gitlab-ce!22216
* Merge branch 'qa-60-reorganize-menu-classes' into 'master'Rémy Coutable2018-10-1035-60/+66
| | | | | | | Reorganize menu files Closes gitlab-org/quality/team-tasks#60 See merge request gitlab-org/gitlab-ce!22115
* Update VERSION to 11.4.0-rc2v11.4.0-rc2GitLab Release Tools Bot2018-10-081-1/+1
|
* Merge commit 'e8f4bfd114f214e17f8777fdedc9aef79ee2552c' into ↵11-4-stable-prepare-rc2Jan Provaznik2018-10-08819-13311/+51739
|\ | | | | | | | | | | 11-4-stable-prepare-rc2 Feature freeze 11.4
| * Merge branch 'update-templates-11-4' into 'master'Kamil Trzciński2018-10-084-3/+14
| |\ | | | | | | | | | | | | Update templates for 11.4 See merge request gitlab-org/gitlab-ce!22188
| | * Update templates for 11.4Jan Provaznik2018-10-084-3/+14
| | |
| * | Merge branch 'increase-event-retention-prune-old-events-worker' into 'master'Douwe Maan2018-10-084-12/+22
| |\ \ | | | | | | | | | | | | | | | | Prune events older than 2 years instead of 12 months See merge request gitlab-org/gitlab-ce!22145