summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | Updated docs to reflect new 2 year periodJeremy Watson2018-10-061-1/+1
| | | |
| | * | Updated code comments for clarity based on 2 yearsJeremy Watson2018-10-061-3/+2
| | | |
| | * | Added changelogJeremy Watson2018-10-061-0/+5
| | | |
| | * | Added new test and updated all event idsJeremy Watson2018-10-051-3/+8
| | | |
| | * | Renamed test eventsJeremy Watson2018-10-051-2/+3
| | | |
| | * | Updated existing spec for new 2 year timeframeJeremy Watson2018-10-051-3/+3
| | | |
| | * | prune older than 2 years instead of 12 monthsJeremy Watson2018-10-051-1/+1
| | | |
| * | | Merge branch 'sh-remove-duplicate-logging' into 'master'Douwe Maan2018-10-081-1/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Remove duplicate Sentry logging for GRPC exceptions See merge request gitlab-org/gitlab-ce!22187
| | * | | Remove duplicate Sentry logging for GRPC messagesStan Hu2018-10-071-1/+0
| | | |/ | | |/| | | | | | | | | Raven.capture_exception is already called by log_exception.
| * | | Merge branch 'update-licenses-11-4' into 'master'Sean McGivern2018-10-081-185/+222
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Update licenses for 11.4 See merge request gitlab-org/gitlab-ce!22189
| | * | | Updated licenses for 11.4Jan Provaznik2018-10-081-185/+222
| | |/ /
| * | | Merge branch 'backport-ce-to-ee-spec-fix' into 'master'Rémy Coutable2018-10-081-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Fix issues controller N+1 failure See merge request gitlab-org/gitlab-ce!22141
| | * | | Fix issues controller N+1 failureSean McGivern2018-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE needs :request_store to cache license queries - otherwise we will blow past the query limit just with `SELECT * FROM licenses` over and over.
| * | | | Merge branch 'patch-29' into 'master'Kamil Trzciński2018-10-081-3/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Updates Laravel.gitlab-ci.yml template See merge request gitlab-org/gitlab-ce!22167
| | * | | | Updates Laravel.gitlab-ci.yml templatePaul Giberson2018-10-061-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates to add gnupgp (required for node setup) Upgrades node install to version 8
| * | | | | Merge branch 'zj-render-log-artifacts' into 'master'Kamil Trzciński2018-10-082-1/+6
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | Render log artifact files in GitLab See merge request gitlab-org/gitlab-ce!22112
| | * | | | Render log artifact files in GitLabZeger-Jan van de Weg2018-10-082-1/+6
| |/ / / /
| * | | | Merge branch 'bw-fix-checking-disabled-services' into 'master'51761-create-new-project-auto-populate-project-slug-string-to-project-name-if-name-is-empty34758-split-create-gcp-controllerStan Hu2018-10-062-11/+31
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Check disabled_services when finding a service See merge request gitlab-org/gitlab-ce!22172
| | * | | | Check disabled_services when finding a serviceBrett Walker2018-10-062-11/+31
| | | | | |
| * | | | | Merge branch '52242-ui-ux-bug-in-change-group-path' into 'master'Douglas Barbosa Alexandre2018-10-063-2/+23
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix invalid parent path on group settings page Closes #52242 See merge request gitlab-org/gitlab-ce!22142
| | * | | | | Fix invalid parent path on group settings pageDmitriy Zaporozhets2018-10-063-2/+23
| |/ / / / /
| * | | | | Merge branch 'ce-1984-frontend-for-batch-comments' into 'master'Tim Zallmann2018-10-0615-50/+123
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Backport CE changes for: [Frontend only] Batch comments on merge requests See merge request gitlab-org/gitlab-ce!22158
| | * | | | Backport CE changes for: [Frontend only] Batch comments on merge requestsAndré Luís2018-10-0615-50/+123
| |/ / / /
| * | | | Merge branch 'add-button-to-insert-table-in-markdown' into 'master'Clement Ho2018-10-065-2/+40
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add button to insert table in markdown editor See merge request gitlab-org/gitlab-ce!18480
| | * | | | Add button to insert table in markdown editorGeorge Tsiolis2018-10-065-2/+40
| |/ / / /
View Lorry Controller Status