summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 11.6.2v11.6.2GitLab Release Tools Bot2019-01-021-1/+1
|
* Update CHANGELOG.md for 11.6.2GitLab Release Tools Bot2019-01-028-35/+13
| | | [ci skip]
* Merge branch '11-6-stable-patch-2' into '11-6-stable'Alex Hanselka2019-01-0245-83/+308
|\ | | | | | | | | Prepare 11.6.2 release See merge request gitlab-org/gitlab-ce!24105
| * Bump Rails 4 dependencies11-6-stable-patch-2Stan Hu2019-01-021-3/+3
| | | | | | | | | | | | | | | | | | We got rid of `Gemfile.rails4.lock` in `master`, but this stable branch still uses it. To fix this, we just need to run: ``` BUNDLE_GEMFILE=Gemfile.rails4 bundle install ```
| * Merge branch 'use-px-not-rems' into 'master'Annabel Dunstone Gray2019-01-023-2/+9
| | | | | | | | | | | | | | | | Use px instead of rems to prep for csslab Closes #55314 See merge request gitlab-org/gitlab-ce!23804
| * Merge branch 'fix-prepare-build-script' into 'master'Marin Jankovski2019-01-021-1/+1
| | | | | | | | | | | | | | | | | | Stop using deprecated argument to `gem` See merge request gitlab-org/gitlab-ce!24079 (cherry picked from commit a352a95e9a4e6e925e43e1b0a3dc2cac6d33cef4) 1854f142 Stop using deprecated argument to `gem`
| * Merge branch 'fj-55781-fix-api-blob-content-disposition' into 'master'Sean McGivern2019-01-025-3/+46
| | | | | | | | | | | | | | | | | | | | | | Fixed content-disposition in blob and files API endpoint Closes #55781 See merge request gitlab-org/gitlab-ce!24078 (cherry picked from commit ca14b70d5201852751d79d6a0827b81689fff5be) 2cd47bba Fixed api content-disposition in blob and files endpoint
| * Merge branch 'sh-fix-clone-geo-dropdown' into 'master'Stan Hu2019-01-022-12/+17
| | | | | | | | | | | | | | | | | | | | Fix clone dropdown parent inheritance issues in HAML See merge request gitlab-org/gitlab-ce!24029 (cherry picked from commit 68e312b20d7fa16ec924be7a7d10fc67ee0c4292) 9e3f9f75 Fix clone dropdown parent inheritance issues in HAML 70d155e8 Add changelog entry
| * Merge branch 'pipeline-labels' into 'master'Stan Hu2019-01-022-2/+5
| | | | | | | | | | | | | | | | | | Fix tooltip titles for pipeline flags See merge request gitlab-org/gitlab-ce!24027 (cherry picked from commit f13ec30d5e0079d66efadd374b219d0c445e28cf) 0f74f6dd Added missing colons near titles.
| * Merge branch 'sh-fix-http-clone-panel' into 'master'Kushal Pandya2019-01-025-26/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing Git clone button when protocol restriction setting enabled Closes #55676 See merge request gitlab-org/gitlab-ce!24015 (cherry picked from commit f044679c96251c82de310219a48cb7814dfe5143) 4a8b4d8a Fix missing Git clone button when protocol restriction setting enabled f50ee65b Add spec for HTTP/SSH clone panel 91b0754d Fix HTTP/SSH clone panel for mobile 29adade5 Fix and move specs into admin_disables_git_access_protocol_spec.rb
| * Merge branch 'markdown-toolbar-btn-fix' into 'master'Filipa Lacerda2019-01-023-3/+12
| | | | | | | | | | | | | | | | | | | | | | Fixes the markdown toolbar buttons Closes #55618 See merge request gitlab-org/gitlab-ce!23979 (cherry picked from commit 82772caf727e3ea59513ffff6693bab1ee37b53f) 3019a567 Fixes the markdown toolbar buttons
| * Merge branch 'qa-fix-select-activities' into 'master'Mark Lapierre2019-01-022-5/+5
| | | | | | | | | | | | | | | | | | | | | | Using find_elements instead of all_elements Closes gitlab-org/quality/staging#18 See merge request gitlab-org/gitlab-ce!23977 (cherry picked from commit 78dcdc871a053e68e60e72d891801895f74b1c79) 35193d5c Using find_elements instead of all_elements
| * Merge branch '55282-dark-theme-colors' into 'master'Mike Greiling2019-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | Remove &:not(.use-csslab) from table to fix dark diff themes Closes #55282 See merge request gitlab-org/gitlab-ce!23941 (cherry picked from commit c699b97f9db6329d7d6a11d0b3bfc90e0b4ff9f0) a798e2cb Remove &:not(.use-csslab) from table to fix dark diff themes
| * Merge branch ↵Stan Hu2019-01-022-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | '54953-fix-commit_email_hostname-accessor-in-fake_application_settings' into 'master' Add FakeApplicationSettings#commit_email_hostname Closes #54953 See merge request gitlab-org/gitlab-ce!23939 (cherry picked from commit 2a9ba34dde0058c94caa696b2be1e53687faf0d0) ecb847fd Add FakeApplicationSettings#commit_email_hostname
| * Merge branch 'fix_reliable_fetcher_version' into 'master'Douglas Barbosa Alexandre2019-01-022-3/+3
| | | | | | | | | | | | | | | | | | | | | | Fix sidekiq-reliable-fetch version Closes sidekiq-reliable-fetch#18 See merge request gitlab-org/gitlab-ce!23937 (cherry picked from commit 37c934e089508e053e6ad4cf075b00cfaab53f3c) 586fd677 Fix sidekiq-reliable-fetch version
| * Merge branch '55103-hide-group-cluster-features' into 'master'Kushal Pandya2019-01-028-19/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Hide cluster features that don't work yet with Group Clusters" Closes #55103 See merge request gitlab-org/gitlab-ce!23935 (cherry picked from commit a91138baaba93b72c3b487d38e11299e99d2071e) 4ed4a640 Expose environment's cluster type 55bfea0a Disable terminal button for group clusters bfbea9b8 Use constants for cluster_type b1fb15f8 Fix formatting e9c4f190 Add CHANGELOG.md entry for gitlab-ce!23935 0d608a7b Add test for environment_terminal_button e18fb5b3 Memoize call for EnvironmentEntity#cluster_type a45fb5d6 Moves memoization to Environment
| * Merge branch '55551-nomethoderror-undefined-method-for-nil-nilclass' into ↵Kamil Trzciński2019-01-022-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Handle nil terminals in Clusters::Platforms::Kubernetes Closes #55551 See merge request gitlab-org/gitlab-ce!23925 (cherry picked from commit 6b02f502c84450d5e23866fef0d3da600d7c78ae) 6d4c2529 Handle nil terminals in Clusters::Platforms::Kubernetes
| * Merge branch 'osw-revert-suggestions-ff' into 'master'Douwe Maan2019-01-025-20/+4
| | | | | | | | | | | | | | | | | | Remove feature flag for suggest changes feature See merge request gitlab-org/gitlab-ce!23892 (cherry picked from commit 58ee1746a867ea939dd64a993963f14fc34c338d) ee425c9c Remove feature flag for suggest changes feature
| * Merge branch '51668-fix-line-numbers' into 'master'Mike Greiling2019-01-022-1/+11
|/ | | | | | | | | | | Fix line-height of line numbers Closes #55278 and #51668 See merge request gitlab-org/gitlab-ce!23775 (cherry picked from commit ed3f0100c3f5c71e3370bcbbf1687a627f4ecc1d) c21df376 Adjust line height of blame view line numbers
* Update VERSION to 11.6.1v11.6.1GitLab Release Tools Bot2018-12-281-1/+1
|
* Update CHANGELOG.md for 11.6.1GitLab Release Tools Bot2018-12-2817-80/+25
| | | [ci skip]
* Merge branch 'security-11-6' of dev.gitlab.org:gitlab/gitlabhq into 11-6-stableJohn Jarvis2018-12-2720-22/+248
|\
| * Merge branch 'security-fix/security-group-user-removal-11-6' into ↵John Jarvis2018-12-2710-11/+120
| |\ | | | | | | | | | | | | | | | | | | 'security-11-6' [11.6] Resolve "Removing a user from a private group doesn't remove them from group's project, if their project's role was changed" See merge request gitlab/gitlabhq!2716
| | * Merge branch 'security-11-6' into ↵James Lopez2018-12-2774-166/+1057
| | |\ | | | | | | | | | | | | | | | | | | | | 'security-fix/security-group-user-removal-11-6' # Conflicts: # app/services/members/destroy_service.rb
| | * | Add subresources removal to member destroy serviceJames Lopez2018-12-1310-13/+116
| | | |
| * | | Merge branch 'security-import-symlink-11-6' into 'security-11-6'John Jarvis2018-12-276-4/+62
| |\ \ \ | | | | | | | | | | | | | | | | | | | | [11.6] Persistent Symlink in Project Import See merge request gitlab/gitlabhq!2728
| | * | | Fix persistent symlink in project importJames Lopez2018-12-186-4/+62
| | |/ / | | | | | | | | | | | | | | | | - Fix permissions after untar is done - Refactor command line util
| * | | Merge remote-tracking branch 'origin/security-48259-private-snippet-11-6' ↵John Jarvis2018-12-279-11/+123
| |\ \ \ | | |_|/ | |/| | | | | | into security-11-6
| | * | Block private snippets from being embeddableMark Chao2018-12-209-11/+123
| | |/ | | | | | | | | | Move embeddable? to model to be used outside view
* | | Merge branch 'security-11-6' of dev.gitlab.org:gitlab/gitlabhq into 11-6-stableJohn Jarvis2018-12-2775-177/+1047
|\ \ \ | |/ /
| * | Merge branch 'security-11-6-secret-ci-variables-exposed' into 'security-11-6'John Jarvis2018-12-2720-44/+372
| |\ \ | | | | | | | | | | | | | | | | [11.6] Secret CI variables can exposed by creating a tag with the same name as an existing protected branch See merge request gitlab/gitlabhq!2684
| | * | Add CHANGELOG entryMatija Čupić2018-12-081-0/+5
| | | |
| | * | Backport security fix for 11.6Matija Čupić2018-12-0819-44/+367
| | |/
| * | Merge branch ↵John Jarvis2018-12-276-3/+77
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'security-11-6-user-keeps-access-to-mr-issue-when-removed-from-team' into 'security-11-6' [11.6] Adds validation to check if user can read project See merge request gitlab/gitlabhq!2753
| | * | Adds validation to check if user can read projectTiago Botelho2018-12-266-3/+77
| | |/ | | | | | | | | | | | | An issuable should not be available to a user if the project is not visible to that specific user
| * | Merge branch 'security-11-6-group-cicd-settings-accessible-to-maintainer' ↵John Jarvis2018-12-275-15/+56
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'security-11-6' [11.6] Group Ex-Maintainer Could maintain Access to Project's Source Code/Jobs/Pipelines/Artifacts if it had Shared Group Runner Configured See merge request gitlab/gitlabhq!2750
| | * | Use old-style controller request paramsMatija Čupić2018-12-241-2/+2
| | | |
| | * | Add CHANGELOG entryMatija Čupić2018-12-241-0/+5
| | | |
| | * | Check for group admin permissionsMatija Čupić2018-12-244-15/+51
| | |/
| * | Merge branch 'security-11-6-guests-jobs-api' into 'security-11-6'John Jarvis2018-12-273-6/+36
| |\ \ | | | | | | | | | | | | | | | | [11.6] Guest users have access to all Job information via the API See merge request gitlab/gitlabhq!2744
| | * | Add CHANGELOG entryMatija Čupić2018-12-221-0/+5
| | | |
| | * | Move pipeline auth above pipeline assignmentMatija Čupić2018-12-221-1/+1
| | | |
| | * | Authorize read_pipeline before read_buildMatija Čupić2018-12-221-0/+1
| | | |
| | * | Authorize read_build when listing pipeline jobsMatija Čupić2018-12-222-3/+15
| | | |
| | * | Authorize read_build action when listing jobsMatija Čupić2018-12-222-3/+15
| | |/
| * | Merge branch 'security-11-6-refs-available-to-project-guest' into ↵John Jarvis2018-12-273-4/+26
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'security-11-6' [11.6] Project guests no longer are able to see refs page See merge request gitlab/gitlabhq!2686
| | * | Project guests no longer are able to see refs pageTiago Botelho2018-12-103-4/+26
| | |/ | | | | | | | | | | | | | | | Adds download_code authorization check to ProjectsController#refs action, to prevent a project guest from seeing branch, tags and commits information
| * | Merge branch 'security-11-6-fix-ssrf-lfs-project-import' into 'security-11-6'John Jarvis2018-12-272-13/+88
| |\ \ | | | | | | | | | | | | | | | | [11.6] SSRF in project imports with LFS See merge request gitlab/gitlabhq!2725
| | * | [11.6] SSRF in project imports with LFSFrancisco Javier López2018-12-272-13/+88
| |/ /
| * | Merge branch 'security-label-xss-11-6' into 'security-11-6'John Jarvis2018-12-273-1/+28
| |\ \ | | | | | | | | | | | | | | | | [11.6] Escape html entities when no label found See merge request gitlab/gitlabhq!2747
View Lorry Controller Status