summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 11.6.0-rc3v11.6.0-rc3GitLab Release Tools Bot2018-12-061-1/+1
|
* Prevent a path traversal attack on global file templatesNick Thomas2018-12-068-2/+90
| | | | | | The API permits path traversal characters like '../' to be passed down to the template finder. Detect these requests and cause them to fail with a 500 response code.
* Merge branch '11-6-stable-prepare-rc3' into '11-6-stable'John Jarvis2018-12-065-42/+16
|\ | | | | | | | | Prepare 11.6 RC3 release See merge request gitlab-org/gitlab-ce!23614
| * Revert "Merge branch '3062-improve-project-cache' into 'master'"Douwe Maan2018-12-065-42/+16
|/ | | | | | | | This reverts commit e65e184269bb27661c9a20658933e8482aa90b62, reversing changes made to 646ba2418b630710edeaac94b57d08adf2771257. # Conflicts: # lib/gitlab/cache/ci/project_pipeline_status.rb
* Merge branch '11-6-stable-prepare-rc2' into '11-6-stable'John Jarvis2018-12-053-39/+0
|\ | | | | | | | | Prepare 11.6 RC2 release See merge request gitlab-org/gitlab-ce!23550
| * Merge branch 'revert-db6cedda' into 'master'Kamil TrzciƄski2018-12-043-39/+0
|/ | | | | | | | | Revert "Merge branch 'auto-devops-support-for-group-security-dashboard' into 'master'" See merge request gitlab-org/gitlab-ce!23530 (cherry picked from commit a82833bceac1568772456188bbc6dc3fc292e237) 568cc2dd Revert "Merge branch 'auto-devops-support-for-group-security-dashboard' into 'master'"
* Update VERSION to 11.6.0-rc1v11.6.0-rc1GitLab Release Tools Bot2018-12-031-1/+1
|
* Merge branch '11-6-stable-prepare-rc1' into '11-6-stable'Alex Hanselka2018-12-032-0/+6
|\ | | | | | | | | Prepare 11.6 RC1 release See merge request gitlab-org/gitlab-ce!23517
| * Merge branch '54048-Line-numbers-are-misaligned-in-file-blame-view' into ↔Annabel Dunstone Gray2018-12-032-0/+6
| |\ |/ / | | | | | | | | | | | | | | 'master' Fix line height of numbers in file blame view. Closes #54048 See merge request gitlab-org/gitlab-ce!23090
| * Fix line height of numbers in file blame view.Johann Hubert Sonntagbauer2018-11-152-0/+6
| | | | | | | | Ensure that line numbers and the text content have the same line-height set.
* | Merge branch 'sh-fix-mirrors-protected-branches' into 'master'Douglas Barbosa Alexandre2018-12-034-8/+56
|\ \ | | | | | | | | | | | | | | | | | | Fix "protected branches only" checkbox not set properly at init Closes #53515 See merge request gitlab-org/gitlab-ce!23409
| * | Add test for "only mirror protected branches" settingLuke Bennett2018-12-032-8/+50
| | |
| * | Fix "protected branches only" checkbox not set properly at initStan Hu2018-12-032-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | The `only_protected_branches` value was being enabled by default even though the checkbox was default off. In EE, this wasn't a problem because there was EE-specific code to update the entire form. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53515
* | | Merge branch '52370-filter-by-none-any-for-labels-in-issues-mrs-boards' into ↔Clement Ho2018-12-036-8/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Filter by `None`/`Any` for labels in issues/mrs/boards" Closes #52370 See merge request gitlab-org/gitlab-ce!23111
| * | | Resolve "Filter by `None`/`Any` for labels in issues/mrs/boards"🙈 jacopo beschi 🙉2018-12-036-8/+27
|/ / /
* | | Merge branch 'render-text-deprecated' into 'master'Robert Speicher2018-12-037-13/+19
|\ \ \ | | | | | | | | | | | | | | | | Fix deprecation: render :text is deprecated because it does not actually render
 See merge request gitlab-org/gitlab-ce!23425
| * | | Fix deprecation: render :text is deprecated because it does not actually ↔Jasper Maes2018-11-297-13/+19
| | | | | | | | | | | | | | | | render a text/plain response
* | | | Merge branch '53400-unstar-icon-button-is-misaligned' into 'master'Mike Greiling2018-12-032-2/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "unstar icon button is misaligned" Closes #53400 See merge request gitlab-org/gitlab-ce!23444
| * | | | Ensure unstar icon retains class when toggledTristan Read2018-12-032-2/+7
| | | | |
* | | | | Merge branch '54514-tooltips' into 'master'Clement Ho2018-12-032-51/+7
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Fixes tooltip overflowing in mini pipeline Closes #54514 See merge request gitlab-org/gitlab-ce!23486
| * | | | Fixes race condition in delayed job specFilipa Lacerda2018-12-031-18/+6
| | | | |
| * | | | Fixes tooltip overflowing in mini pipelineFilipa Lacerda2018-11-302-33/+1
| | | | |
* | | | | Merge branch '54648-fix-order-by-dropdown-tablet-screens' into 'master'Annabel Dunstone Gray2018-12-0317-31/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix secondary nav dropdown menu styling in tablet and mobile screens Closes #54648 See merge request gitlab-org/gitlab-ce!23446
| * | | | | Fix secondary nav dropdown menu styling in tablet and mobile screensKushal Pandya2018-12-0317-31/+36
|/ / / / /
* | | | | Merge branch 'ce-6718_store_dependency_scanning_results_in_db' into 'master'Kamil TrzciƄski2018-12-032-50/+277
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update Dependency Scanning report fixtures See merge request gitlab-org/gitlab-ce!23460
| * | | | | Update Dependency Scanning report fixturesOlivier Gonzalez2018-12-032-50/+277
| | | | | | | | | | | | | | | | | | | | | | | | Sync content with EE fixtures
* | | | | | Merge branch 'mlapierre-master-patch-02698' into 'master'RĂ©my Coutable2018-12-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CONTRIBUTING.md: style guide link See merge request gitlab-org/gitlab-ce!23481
| * | | | | | Update CONTRIBUTING.md: style guide linkMark Lapierre2018-11-301-1/+1
| | | | | | |
* | | | | | | Update CHANGELOG.md for 11.4.9GitLab Release Tools Bot2018-12-033-10/+8
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch '5426-fe-web-terminal-empty-state-ce' into 'master'Phil Hughes2018-12-033-1/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | CE Port of "Add empty and disabled web terminal tab" See merge request gitlab-org/gitlab-ce!23496
| * | | | | | CE Port of "Add empty and disabled web terminal tab"Paul Slaughter2018-12-033-1/+6
|/ / / / / /
* | | | | | Merge branch 'ce-2122-transform-linked-into-button' into 'master'Phil Hughes2018-12-031-5/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduces CE to EE differences See merge request gitlab-org/gitlab-ce!23452
| * | | | | | Reduces CE to EE differencesFilipa Lacerda2018-11-291-5/+0
| | | | | | |
* | | | | | | Merge branch '1979-redesign-mr-widget-approvals-ce' into 'master'Phil Hughes2018-12-0315-116/+386
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redesign of MR header sections (CE Port) See merge request gitlab-org/gitlab-ce!23465
| * | | | | | | Redesign of MR header sections (CE Port)Paul Slaughter2018-11-3015-116/+386
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8593 - Create mr-widget-icon to encapsulate circle icons - Decouple workflow L&F from mr-widget-heading - Decouple container L&F from mr-widget-heading
* | | | | | | Merge branch 'improve_auto_devops_migration_debug' into 'master'Dmitriy Zaporozhets2018-12-032-0/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add echo so that we know which branch was taken See merge request gitlab-org/gitlab-ce!23499
| * | | | | | | Add echo so that we know which branch was takenThong Kuah2018-12-032-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should help debug issues like https://gitlab.com/gitlab-org/gitlab-ce/issues/54760
* | | | | | | | Merge branch 'fix-mr-widget-unrelated-deployment-status' into 'master'Kamil TrzciƄski2018-12-036-16/+66
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix unrelated deployment status in MR widget Closes #54125 See merge request gitlab-org/gitlab-ce!23175
| * | | | | | | | Squashed commit of the following:Shinya Maeda2018-12-036-16/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 04b06a2293fa12660a9c213a9db27fe90b83248b Merge: d580841d4ed a445aa0a926 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Dec 3 10:51:55 2018 +0900 Merge branch 'master-ce' into fix-mr-widget-unrelated-deployment-status commit d580841d4ed944f01e6417fa77842826843b6a04 Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Nov 30 18:11:04 2018 +0900 Add environment to all_models.yml commit 689fbe2699a3adf10804312e680fa336e4560eaf Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Nov 30 17:00:35 2018 +0900 Proper way to get uniq relationship commit c0733c6ecd535a6a1b6243080a2226836890f479 Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Nov 30 16:20:40 2018 +0900 Revert build change commit 19dc55a8fe6e0fa575858d51144516b7fb0120de Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Nov 30 16:19:18 2018 +0900 Add uniq option commit 0a6995f311c09b453fd0aecff2f6052de38efc27 Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Nov 30 16:14:30 2018 +0900 Drop persisted_environment commit 3f68fc783b0ee0d66e03de6d979616c4c4892118 Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Nov 28 13:59:04 2018 +0900 Return empty array if pipeline is nil commit 73801c5c3d06339e38dce7461a71285bcdbb8f45 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Nov 27 16:34:47 2018 +0900 Add changelog commit d461699abf2835cc51949a5138e829628209dd6d Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Nov 27 16:32:20 2018 +0900 Squashed commit of the following: commit 77ab5259605e217a39b04d2cea6204277e42d2b5 Merge: 7ac1ed50612 2ee8c40fc16 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Nov 27 16:31:07 2018 +0900 Merge branch 'master-ce' into fix-mr-widget-unrelated-deployment-status commit 7ac1ed50612620df6408220b0a7cfcb626a04c48 Merge: 49ba5c5aeff b55aeca25e7 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Nov 26 20:01:43 2018 +0900 Merge branch 'master-ce' into fix-mr-widget-unrelated-deployment-status commit 49ba5c5aeff3efee7b7498d443372021c3f4f8b5 Merge: aa3fd0ff9e8 fbbe5ccd1be Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Nov 26 15:27:36 2018 +0900 Merge branch 'master-ce' into fix-mr-widget-unrelated-deployment-status commit aa3fd0ff9e8a418a233ebaa60b38c081cab50099 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Nov 20 18:28:53 2018 +0900 Fix static analysis commit 7afe5f37003869a73dbb297229f8533f78b82684 Merge: e65b9580ff4 8a581d531ba Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Nov 20 18:27:33 2018 +0900 Merge branch 'master-ce' into fix-mr-widget-unrelated-deployment-status commit e65b9580ff422359113e1a4e37c212f7b13aba4d Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Nov 19 17:59:48 2018 +0900 Ignore deployments from project import/export commit 9eb4ddab8415c1ef61a3c646bdc4602bcf4ebe24 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Nov 19 16:26:00 2018 +0900 Add memoization commit 57f0bea3aaaa07b75d18e52068c532277350cda0 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Nov 19 16:21:39 2018 +0900 Fix unrelated deployment status in MR widget
* | | | | | | | | Merge branch 'patch-31' into 'master'Achilleas Pipinellis2018-12-031-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update architecture.md See merge request gitlab-org/gitlab-ce!23430
| * | | | | | | | | Update architecture.mdB1nj0y2018-11-291-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'jupyter-tls' into 'master'Dmitriy Zaporozhets2018-12-033-1/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTTPS for JupyterHub installation See merge request gitlab-org/gitlab-ce!23479
| * | | | | | | | | | HTTPS for JupyterHub installationAmit Rathi2018-12-033-1/+11
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'order-of-notification-settings' into 'master'Sean McGivern2018-12-032-1/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reorder notification settings by noisy-ness See merge request gitlab-org/gitlab-ce!23490
| * | | | | | | | | | reorder notification settings by noisy-nessC.J. Jameson2018-11-302-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes !54609
* | | | | | | | | | | Merge branch 'patch-31' into 'master'Achilleas Pipinellis2018-12-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated Katex "Supported Functions" link See merge request gitlab-org/gitlab-ce!23343
| * | | | | | | | | | | Updated Katex "Supported Functions" linkLorenz Schmid2018-11-261-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'gt-change-auto-devops-banner-link-path' into 'master'Achilleas Pipinellis2018-12-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change auto devops banner link path Closes #54689 See merge request gitlab-org/gitlab-ce!23476
| * | | | | | | | | | | | Change auto devops banner link pathGeorge Tsiolis2018-11-301-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'patch-34' into 'master'Evan Read2018-12-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slightly improve readability See merge request gitlab-org/gitlab-ce!23466