summaryrefslogtreecommitdiff
path: root/changelogs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sh-fix-mermaid-start-on-load-typo' into 'master'Jacob Schatz2018-01-181-0/+5
| | | | | | | | | | | Fix Mermaid drawings not loading on some browsers Closes #42052 See merge request gitlab-org/gitlab-ce!16537 (cherry picked from commit 50a649530a53a04d2044f9e4c5502586a7ed0c59) b1261ad9 Fix Mermaid drawings not loading on some browsers
* Merge branch 'remove-soft-removals' into 'master'Douwe Maan2018-01-181-0/+5
| | | | | | | | | | | | Remove soft removals related code Closes #37447 See merge request gitlab-org/gitlab-ce!15789 (cherry picked from commit 7acabf7c5908940665e1a8c4e3d09d423385657a) d0b8f536 Remove soft removals related code e5c49b57 Added tests for removing soft removed objects
* Merge branch 'ce-backport-4378-fix-cluster-js-not-running-on-update-page' ↵Filipa Lacerda2018-01-171-0/+5
| | | | | | | | | | into 'master' Fix JS bundle not running on the Cluster update/destroy pages -- CE backport Closes gitlab-ee#4378 See merge request gitlab-org/gitlab-ce!16506
* Merge branch '10-4-stable-prepare-rc7' of ↵Luke Bennett2018-01-171-0/+5
|\ | | | | | | https://gitlab.com/gitlab-org/gitlab-ce into 10-4-stable-prepare-rc7
| * Merge branch '42031-fix-links-to-uploads-in-wikis' into 'master'Douwe Maan2018-01-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | Resolve "Wiki uploaded files are missing" Closes #42031 See merge request gitlab-org/gitlab-ce!16499 (cherry picked from commit 79b05cdd469726582e916cb606ba14b440a59011) 31e59219 Fix links to uploaded files on wiki pages
* | Merge branch '10-4-stable-prepare-rc7' of ↵Luke Bennett2018-01-171-0/+5
|\ \ | |/ | | | | https://gitlab.com/gitlab-org/gitlab-ce into 10-4-stable-prepare-rc7
| * Merge branch '42046-fork-icon' into 'master'Fatih Acet2018-01-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Resolve "Icons on forks page are to big" Closes #42046 See merge request gitlab-org/gitlab-ce!16474 (cherry picked from commit 78ca7d97bbb12be11bd2ebeb8b03ae2277c5ec10) d76047a1 fix fork icon size and button icon color on Forks page 3ec647ed Update 42046-fork-icon.yml
* | Merge branch 'mr-status-box-update' into 'master'Filipa Lacerda2018-01-171-0/+5
|/ | | | | | Fixed merge request status badge not updating after merging See merge request gitlab-org/gitlab-ce!16470
* Merge branch 'jej/lfs-rev-list-handles-non-utf-paths-41627' into 'master'Stan Hu2018-01-171-0/+5
| | | | | | | | | | | Prevent RevList failing on non utf8 paths Closes #41627 See merge request gitlab-org/gitlab-ce!16440 (cherry picked from commit 3228ac06a019c9126b965ff32e354d10011a4f76) c4dd7b82 Prevent RevList failing on non utf8 paths
* Merge branch '41727-target-branch-name' into 'master'Sean McGivern2018-01-171-0/+5
| | | | | | | | | | | Set target_branch to the ref branch when creating MR from issue Closes #41727 See merge request gitlab-org/gitlab-ce!16422 (cherry picked from commit b4bc9bd5c5bedcd57e795f91f0668d7f2c622cde) 7e9484e9 Set target_branch to the ref branch when creating MR from issue
* Merge branch '41874-closed-todo' into 'master'Douwe Maan2018-01-171-0/+5
| | | | | | | | Resolve "Closed issue label in todo's styling is difficult to read" Closes #41874 See merge request gitlab-org/gitlab-ce!16414
* Merge branch 'mk-fix-permanent-redirect-validation' into 'master'Douwe Maan2018-01-171-0/+5
| | | | | | | | | | | | | | Fix Route validation when conflicting permanent redirects exist Closes gitlab-com/support-forum#2883 and #41786 See merge request gitlab-org/gitlab-ce!16397 (cherry picked from commit d607f16fe5a1ec51eaea5811b5118b1ba48acfbc) 1dc30595 Revert "Revert "Fix Route validation for unchanged path"" c517788e Fix Rubocop offense 601c24d5 Add RedirectRoute factory d4c8d1b7 Add changelog entry
* Merge branch 'jej/backport-authorized-keys-to-ce' into 'master'Douwe Maan2018-01-171-0/+5
| | | | | | | | | | | | | | | | | | | | | Backport authorized_keys Closes gitlab-ee#3953 See merge request gitlab-org/gitlab-ce!16014 (cherry picked from commit 2e4a1b3b78a76103198180acf873de8470d7cecf) ac86b204 Backport authorized_keys branch 'find-key-by-fingerprint' 255a0f85 Backport option to disable writing to `authorized_keys` file 07bd79cd Combine ssh docs and rename the doc bcffeade Use ApplicationSetting.current in Admin::ApplicationSettingsController 797fe0a6 Backport authorized_keys_enabled defaults to true' d2f4e8f9 Avoid adding index if already exists 01319e59 Make Gitlab::CurrentSettings available when getting settings d9557e43 Backport spec fixes in spec/lib/gitlab/shell_spec.rb 40e3d9f3 Fix typo in spec/requests/api/internal_spec.rb bd9ead68 Fix spec in shell_spec.rb 9edd9a5e Adds changelog for backport of authorized_keys DB lookup from EE
* Merge branch '10-4-stable-prepare-rc6' into '10-4-stable'10-4-stable-with-rc5-and-rc6LUKE BENNETT2018-01-178-0/+41
|\ | | | | | | | | 10.4.0-rc6 on rc5 sec release See merge request gitlab/gitlabhq!2310
| * Merge branch '42025-fix-issue-api' into 'master'10-4-stable-prepare-rc6Sean McGivern2018-01-151-0/+5
| | | | | | | | | | [API] Fix creating issue when assignee_id is empty See merge request gitlab-org/gitlab-ce!16458
| * Merge branch 'fj-41598-fixing-request-mime-type' into 'master'Douwe Maan2018-01-151-0/+5
| | | | | | | | | | | | | | Fixing request json mime type Closes #41598 See merge request gitlab-org/gitlab-ce!16427
| * Merge branch 'disable-pages-on-jobs' into 'master'Yorick Peterse2018-01-151-0/+6
| | | | | | | | | | | | | | Use simple Next/Prev paging for CI Jobs page Closes #41058 See merge request gitlab-org/gitlab-ce!16392
| * Merge branch 'Ben305/gitlab-ce-36669-default-mr-title-with-external-issues' ↵Grzegorz Bizon2018-01-151-0/+5
| | | | | | | | | | | | | | | | | | into 'master' Resolve "Incorrect default merge request title when Jira activated" Closes #36669 See merge request gitlab-org/gitlab-ce!16356
| * Merge branch '41882-respect-only-path-in-relative-link-filter' into 'master'Douwe Maan2018-01-151-0/+5
| | | | | | | | | | | | | | Resolve "Attachments in e-mail notifications are using the wrong URL" Closes #41882 See merge request gitlab-org/gitlab-ce!16364
| * Merge branch '41789-fix-up-web-ide-user-preference-copy-and-buttons' into ↵Tim Zallmann2018-01-151-0/+5
| | | | | | | | | | | | | | | | | | 'master' Fix up Web IDE user preference copy and buttons Closes #41789 See merge request gitlab-org/gitlab-ce!16298
| * Merge branch 'sh-fix-bare-import-hooks' into 'master'James Lopez2018-01-151-0/+5
| | | | | | | | | | | | | | Fix hooks not being set up properly for bare import Rake task Closes #41739 See merge request gitlab-org/gitlab-ce!16280
| * Merge branch '41491-fix-nil-blob-name-error' into 'master'Annabel Dunstone Gray2018-01-151-0/+5
| | | | | | | | | | | | | | Fix 500 error when visiting a commit where the blobs do not exist (nil blobs) Closes #41491 See merge request gitlab-org/gitlab-ce!16237
* | Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3'Robert Speicher2018-01-151-0/+5
| | | | | | | | | | | | | | | | | | [10.3] Prevent login with disabled OAuth providers See merge request gitlab/gitlabhq!2296 (cherry picked from commit 4936650427ffc88e6ee927aedbb2c724d24b094c) a0f9d222 Prevents login with disabled OAuth providers
* | Merge branch 'fix/import-rce-10-3' into 'security-10-3'James Lopez2018-01-151-0/+5
| | | | | | | | | | | | | | | | | | [10.3] Fix RCE via project import mechanism See merge request gitlab/gitlabhq!2294 (cherry picked from commit dcfec507d6f9ee119d65a832393e7c593af1d3b2) 86d75812 Fix RCE via project import mechanism
* | Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into ↵Douwe Maan2018-01-151-0/+5
| | | | | | | | | | | | | | | | 'security-10-3' [10.3] Migrate `can_push` column from `keys` to `deploy_keys_project` See merge request gitlab/gitlabhq!2276
* | Merge branch '41567-projectfix' into 'security-10-3'Sean McGivern2018-01-151-0/+6
| | | | | | | | | | | | | | | | | | check project access on MR create See merge request gitlab/gitlabhq!2273 (cherry picked from commit 1fe2325d6ef2bced4c5e97b57691c894f38b2834) 43e85f49 check project access on MR create
* | Merge branch 'ac/fix-path-traversal' into 'security-10-3'Robert Speicher2018-01-151-0/+5
| | | | | | | | | | | | | | | | | | [10.3] Fix path traversal in gitlab-ci.yml cache:key See merge request gitlab/gitlabhq!2270 (cherry picked from commit c32d0c6807dfd41d7838a35742e6d0986871b389) df29094a Fix path traversal in gitlab-ci.yml cache:key
* | Merge branch 'milestones-finder-order-fix' into 'security-10-3'Robert Speicher2018-01-151-0/+5
| | | | | | | | | | | | | | | | | | Remove order param from the MilestoneFinder See merge request gitlab/gitlabhq!2259 (cherry picked from commit 14408042e78f2ebc2644f956621b461dbfa3d36d) 155881e7 Remove order param from the MilestoneFinder
* | Merge branch ↵Stan Hu2018-01-151-0/+5
|/ | | | | | | | 'security-10-3-do-not-expose-passwords-or-tokens-in-service-integrations-api' into 'security-10-3' Filter out sensitive fields from the project services API See merge request gitlab/gitlabhq!2281
* Merge branch ↵Yorick Peterse2018-01-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40418-migrate-existing-data-from-kubernetesservice-to-clusters-platforms-kubernetes' into 'master' Migrate existing data from KubernetesService to Clusters::Platforms::Kubernetes Closes #40418 See merge request gitlab-org/gitlab-ce!15589 (cherry picked from commit 4b92efd90cedaa0aff218d11fdce279701128bea) 5b2ca1c6 Migrate existing data from KubernetesService to Clusters::Platforms::Kubernetes e4745492 Add test. Disable KubernetesService when migrated b9fbfe5a Fix unmanaged_kubernetes_service scope for multiple clusters 40c6af54 Fix migration file typos and reorder Table definition 27111e29 Restructure spec 4dc14576 Fix comments 8e6ffe35 Fix test 7eeada80 Add env_scope tests f083739e Add logic to swtich environment_scope by the situation 9b7719b6 Use explicit namespace for avoiding reference from application code 665972e2 Avoid quotes in ActiveRecord query c8059881 Opitmize migration process by using both unmanaged_kubernetes_service and… b8a275d3 Use bulk_insert instead of AR create acfb8464 Fix static anylysy 8bc3221f Fix query to look for proper unmanaged kubernetes service 2d3c7d29 Use batch update for Service deactivation 1c404c91 Add a new test for emptified params 183dbdc8 Revert bulk_insert and bring back AR insert(one by one) 54d20d1b Add changelog 290c2248 Fix change log 58d074e0 Fix StaticSnalysys df658c7b Disable STI of ActiveRecord. Refactoring specs. c425ff75 Fix static analysys 67327952 Add memoization for properties
* Revert "Merge branch ↵Luke Bennett2018-01-111-5/+0
| | | | | | | '40418-migrate-existing-data-from-kubernetesservice-to-clusters-platforms-kubernetes' into 'master'" This reverts commit 4b92efd90cedaa0aff218d11fdce279701128bea, reversing changes made to 33cea50976a6a066641b696527dc2d9e980183fb.
* Merge branch '10-4-stable-missing-commits' into ↵Luke Bennett2018-01-105-0/+25
|\ | | | | | | 10-4-stable-prepare-rc3-with-missing-commits
| * Merge branch ↵Yorick Peterse2018-01-081-0/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | '40418-migrate-existing-data-from-kubernetesservice-to-clusters-platforms-kubernetes' into 'master' Migrate existing data from KubernetesService to Clusters::Platforms::Kubernetes Closes #40418 See merge request gitlab-org/gitlab-ce!15589
| | * Fix change logShinya Maeda2018-01-081-1/+1
| | |
| | * Add changelogShinya Maeda2018-01-081-0/+5
| | |
| * | Merge branch '41754-update-scss-lint-to-0-56-0' into 'master'Rémy Coutable2018-01-081-0/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade scss-lint to 0.56.0 Closes #41754 See merge request gitlab-org/gitlab-ce!16278
| * \ \ Merge branch 'delay-background-migrations' into 'master'Rémy Coutable2018-01-081-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run background migrations with a minimum interval Closes #41624 See merge request gitlab-org/gitlab-ce!16230
| | * | | Run background migrations with a minimum intervaldelay-background-migrationsYorick Peterse2018-01-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a minimum interval to BackgroundMigrationWorker, ensuring background migrations of the same class only run once every 5 minutes. This prevents a thundering herd problem where scheduled migrations all run at once due to their delays having been expired (e.g. as the result of a queue being paused for a long time). If a job was recently executed it's rescheduled with a delay that equals the remaining time of the job's lease. This means that if the lease expires in two minutes we only need to wait two minutes, instead of five. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/41624
| * | | | Merge branch '40549-render-emoj-in-groups-overview' into 'master'Sean McGivern2018-01-081-0/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "No Rendering of emoji's in Group-Overview after update" Closes #40549 See merge request gitlab-org/gitlab-ce!16098
| | * | | | Rendering of emoji's in Group-OverviewJacopo2017-12-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Allows rendering of emoji's in the Group Overview.
| * | | | | Resolve "Add graph value to hover"Mike Greiling2018-01-081-0/+5
| | | | | |
| * | | | | Fix slash commands dropdown descriptionMaurizio De Santis2018-01-081-0/+5
| | | | | |
| * | | | | disables the shortcut to the issue boards when issues are disabledChristiaan Van den Poel2018-01-081-0/+5
| | | | | |
| * | | | | Merge branch '3968-protected-branch-is-not-set-for-default-branch-on-import' ↵Douwe Maan2018-01-081-0/+5
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Protected branch is now created for default branch on import Closes #3968 See merge request gitlab-org/gitlab-ce!16198
| | * | | | Protected branch is now created for default branch on import3968-protected-branch-is-not-set-for-default-branch-on-importTiago Botelho2018-01-061-0/+5
| | | | | |
* | | | | | Merge branch 'delay-background-migrations' into 'master'Rémy Coutable2018-01-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run background migrations with a minimum interval Closes #41624 See merge request gitlab-org/gitlab-ce!16230 (cherry picked from commit 8ff0c9b15124a391bc2fc9059211d2b8d5373a2d) 7f30bb9c Run background migrations with a minimum interval
* | | | | | Merge branch '3968-protected-branch-is-not-set-for-default-branch-on-import' ↵Douwe Maan2018-01-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Protected branch is now created for default branch on import Closes #3968 See merge request gitlab-org/gitlab-ce!16198 (cherry picked from commit 15f7f52b4034d4ede3b923e95df6884f36194245) 819fc98f Protected branch is now created for default branch on import
* | | | | | Merge branch 'fj-41681-add-param-disable-commit-stats-api' into 'master'Douwe Maan2018-01-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option to disable commit stats to commit API Closes #41681 See merge request gitlab-org/gitlab-ce!16309 (cherry picked from commit 088de97c3d86d9cf615538836527d23dbccd9712) baeceb8b Adding stats param to the commit's endpoint 114cad58 Updated documentation d5c5f2e6 Added specs 8f9e778a Added changelog
* | | | | | Merge branch 'fj-41477-fix-bug-wiki-last-version' into 'master'Douwe Maan2018-01-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing bug related to wiki last version Closes #41477 and #41506 See merge request gitlab-org/gitlab-ce!16197 (cherry picked from commit 65b04860c24949f8c327db0be9fc967dfe8225b5) e44ca26f Fixing bug related to wiki last version abe399b1 Added changelog e471ec00 Restoring last version and created monkey patch 52c9dcb4 Fixed spec descriptions 5814d83c Updated monkey patch to work with paths with more than one dir b9ff53c0 Updated specs bc261232 Fixing offense
* | | | | | Merge branch 'changes-dropdown-ellipsis' into 'master'Sean McGivern2018-01-101-0/+5
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix changes dropdown ellipsis working across browsers Closes #41561 and #41684 See merge request gitlab-org/gitlab-ce!16281 (cherry picked from commit 8de1bb9e74a00766c663b1cdf8c7b49ddc060caf) 500a3de7 Fix changes dropdown ellipsis working across browsers
View Lorry Controller Status