summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 11.10.3v11.10.3GitLab Release Tools Bot2019-04-301-1/+1
|
* Update CHANGELOG.md for 11.10.3GitLab Release Tools Bot2019-04-302-5/+7
| | | [ci skip]
* Merge branch ↵GitLab Release Tools Bot2019-04-297-182/+224
|\ | | | | | | | | | | | | 'security-disallow-read-user-scope-to-read-project-events-11-10' into '11-10-stable' Disallow read user scope to read project events See merge request gitlab/gitlabhq!3086
| * Fix specsMałgorzata Ksionek2019-04-251-2/+2
| |
| * Add new api class for projects eventsMałgorzata Ksionek2019-04-247-182/+224
| | | | | | | | | | | | | | | | | | | | | | | | Refactor api events class to use external helper Move specs from old class Add changelog and magic string Refactor events class to be more explicit Remove blank line
* | Update VERSION to 11.10.2v11.10.2GitLab Release Tools Bot2019-04-251-1/+1
| |
* | Update CHANGELOG.md for 11.10.2GitLab Release Tools Bot2019-04-255-20/+10
| | | | | | [ci skip]
* | Merge branch 'security-approval-race-condition-11-10' into '11-10-stable'GitLab Release Tools Bot2019-04-252-3/+33
|\ \ | | | | | | | | | | | | Add ApplicationRecord#safe_ensure_unique method See merge request gitlab/gitlabhq!3055
| * | Add ApplicationRecord#safe_ensure_unique methodPatrick Bajao2019-04-122-3/+33
| | | | | | | | | | | | | | | | | | Port of https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/866 to CE excluding the migration and service changes as they don't apply to CE.
* | | Merge branch 'security-pb-email-watchers-no-access-11-10' into '11-10-stable'GitLab Release Tools Bot2019-04-253-12/+53
|\ \ \ | | | | | | | | | | | | | | | | Stop sending emails to users who can't read commit See merge request gitlab/gitlabhq!3063
| * | | Stop sending emails to users who can't read commitPatrick Bajao2019-04-163-12/+53
| | | | | | | | | | | | | | | | | | | | | | | | This is to ensure that only users will be able receive an email if they can read a commit from the repository even if they are watching the activity of it.
* | | | Merge branch 'security-id-email-xss-11-10' into '11-10-stable'GitLab Release Tools Bot2019-04-252-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Escape path in new merge request mail See merge request gitlab/gitlabhq!3068
| * | | | Escape path in new merge request mailIgor Drozdov2019-04-172-1/+6
| | |/ / | |/| |
* | | | Merge branch 'security-issue_2830-11-10' into '11-10-stable'GitLab Release Tools Bot2019-04-253-7/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Prevent leaking information when issue is moved See merge request gitlab/gitlabhq!3072
| * | | | Prevent leaking information when issue is movedFelipe Artur2019-04-223-7/+27
| | | | | | | | | | | | | | | | | | | | Prevent leaking namespace and project names on moved issue links
* | | | | Merge branch 'security-update-gitaly-to-11-33-1' into '11-10-stable'GitLab Release Tools Bot2019-04-252-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve credentials sanitization on repository mirror integration See merge request gitlab/gitlabhq!3076
| * | | | | Add changelogOswaldo Ferreira2019-04-231-0/+5
| | | | | |
| * | | | | Update Gitaly to 11.34.1Oswaldo Ferreira2019-04-231-1/+1
|/ / / / /
* | | | | Update VERSION to 11.10.1v11.10.1GitLab Release Tools Bot2019-04-231-1/+1
| | | | |
* | | | | Update CHANGELOG.md for 11.10.1GitLab Release Tools Bot2019-04-236-25/+20
| | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch '11-10-stable-patch-1' into '11-10-stable'Marin Jankovski2019-04-2341-242/+620
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Prepare 11.10.1 release See merge request gitlab-org/gitlab-ce!27570
| * | | | Merge branch ↵11-10-stable-patch-1Kamil Trzciński2019-04-233-42/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '60569-timeline-entry-label-link-is-not-applying-the-filter-on-issues' into 'master' Adds `label_name` back as a scalar param in `IssuableFinder` Closes #60569 See merge request gitlab-org/gitlab-ce!27507 (cherry picked from commit 5b154dafdf661cd2c7143de7e51e87d2bac4130b) ff627511 Add label_name as scalar param of IssuableFinder
| * | | | Merge branch 'sh-bump-ruby-required-version-check' into 'master'Michael Kozono2019-04-232-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump required Ruby version check to 2.5.3 Closes #60704 See merge request gitlab-org/gitlab-ce!27495 (cherry picked from commit e9bf3672dff56cf845114856a17ea72328215bcf) 0ca790af Bump required Ruby version check to 2.5.3
| * | | | Merge branch 'jc-upgrade-gitaly-1.34.0' into 'master'Stan Hu2019-04-232-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to 1.34.0 See merge request gitlab-org/gitlab-ce!27494 (cherry picked from commit 63e41ba61b3ae0fba19500d01bfe041109590d14) 400d1369 Upgrade Gitaly to 1.34.0
| * | | | Merge branch 'sh-fix-related-merge-request-api-paths' into 'master'Fatih Acet2019-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix related merge requests not working with relative URL root See merge request gitlab-org/gitlab-ce!27475 (cherry picked from commit 2bbad757c9d16abe045fa1f3529c81e5c6c9d3e7) 31b4e54e Fix related merge requests not working with relative URL root
| * | | | Merge branch 'docs-fixes-for-rp-11-10' into 'master'Achilleas Pipinellis2019-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc fixes for the release post 11.10 See merge request gitlab-org/gitlab-ce!27450 (cherry picked from commit 42c99d9e36895c221d47bd961cca6a06097cbe85) 6dad16df Fixes "introduced in" note
| * | | | Merge branch 'adriel-fix-cluster-metrics-regression' into 'master'Clement Ho2019-04-232-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve cluster metrics regression Closes gitlab-ee#11168 See merge request gitlab-org/gitlab-ce!27442 (cherry picked from commit a82f553b15d9ac488def6a70b9bfe3215e9ae66f) 087c69a8 Resolve cluster metrics regression
| * | | | Merge branch 'sh-backport-list-commits-by-oid-rugged' into 'master'Douwe Maan2019-04-235-2/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring back Rugged implementation of ListCommitsByOid See merge request gitlab-org/gitlab-ce!27441 (cherry picked from commit 6a72ab22c824c17e311492888fc99473a5c89192) 2fc4de6a Bring back Rugged implementation of ListCommitsByOid
| * | | | Merge branch 'if-57131-move_do' into 'master'Achilleas Pipinellis2019-04-233-0/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move external authorization doc to CE See merge request gitlab-org/gitlab-ce!27421 (cherry picked from commit 3b483ed3f78ab759bde17c692246b20a41444d51) b8af0075 Move external authorization doc to CE
| * | | | Merge branch 'jivl-add-feature-flag-gon-ee' into 'master'Fatih Acet2019-04-232-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make the monitoring bundle reusable See merge request gitlab-org/gitlab-ce!27402 (cherry picked from commit ce02daea08c4cc7bc5e65e56f9b3d744a2e1faa6) 761fa974 Make the monitoring bundle reusable
| * | | | Merge branch ↵Kamil Trzciński2019-04-2310-62/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '60500-disable-jit-kubernetes-resource-creation-for-project-level-clusters' into 'master' Disable JIT Kubernetes resource creation for project level clusters Closes #60500 See merge request gitlab-org/gitlab-ce!27352 (cherry picked from commit a6a1afe070ffe4fa66b5ace9d35ca8c6ee481986) e33ecfde Disable JIT resource creation for project clusters
| * | | | Merge branch 'bvl-graphql-only-authorize-rendered-fields' into 'master'Lin Jen-Shin2019-04-239-121/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only check abilities on rendered GraphQL nodes Closes #58647 and #60355 See merge request gitlab-org/gitlab-ce!27273 (cherry picked from commit 4d2bce770bdf1b12378d3c06f895cc73d46d6f9f) eca8e6f0 Only check abilities on rendered GraphQL nodes
| * | | | Merge branch 'masked-variables-docs-update-docs-only' into 'master'Mike Lewis2019-04-231-6/+15
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Masked Variables to Variables documentation See merge request gitlab-org/gitlab-ce!27236 (cherry picked from commit d7af5ab7d49a6190d4741aac4764bdc3c6973599) 05e36790 Add Masked Variables to Variables docs
* | | | Update VERSION to 11.10.0v11.10.0GitLab Release Tools Bot2019-04-191-1/+1
| | | |
* | | | Update CHANGELOG.md for 11.10.0GitLab Release Tools Bot2019-04-19208-1041/+231
| | | | | | | | | | | | [ci skip]
* | | | Update VERSION to 11.10.0-rc8v11.10.0-rc8GitLab Release Tools Bot2019-04-171-1/+1
| | | |
* | | | Merge branch '11-10-stable-prepare-rc8' into '11-10-stable'Marin Jankovski2019-04-1781-11347/+126822
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Prepare 11.10.0-rc8 release See merge request gitlab-org/gitlab-ce!27449
| * | | Merge branch 'sh-fix-merge-requests-api-remove-branch-param-11-10-rc8' into ↵11-10-stable-prepare-rc8Marin Jankovski2019-04-174-2/+34
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '11-10-stable-prepare-rc8' [11.10 RC8 port] Fix remove_source_branch merge request API handling See merge request gitlab-org/gitlab-ce!27459
| | * | | Merge branch 'sh-fix-merge-requests-api-remove-branch-param' into 'master'Michael Kozono2019-04-174-2/+34
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix remove_source_branch merge request API handling Closes #60530 See merge request gitlab-org/gitlab-ce!27392
| * | | Merge branch '60533-tooltip-for-view-file-shows-raw-html' into 'master'Kushal Pandya2019-04-172-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Tooltip for "View file" shows raw HTML" Closes #60533 See merge request gitlab-org/gitlab-ce!27398 (cherry picked from commit be201c595fe8a8c23c52b85cb6f47eaf51ced775) a1179e5e Fix showing HTML content in view file tooltip
| * | | Merge branch '48431-width' into 'master'Kushal Pandya2019-04-173-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide overflow in scoped labels Closes #48431 See merge request gitlab-org/gitlab-ce!27362 (cherry picked from commit 86be4a6f466205b415de74330dd495a2e8b3c9d0) 17a48fad Hide overflow in scoped labels
| * | | Merge branch '60480-rescue-build-preparing-errors' into 'master'Kamil Trzciński2019-04-172-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rescue and log errors raised when preparing builds Closes #60480 See merge request gitlab-org/gitlab-ce!27351 (cherry picked from commit 20d8dc53c8b1268c5823cc18e594c54400776ba3) 781cd4a2 Rescue and log errors raised when preparing builds
| * | | Merge branch 'bvl-new-translations-ce' into 'master'Rémy Coutable2019-04-1745-11268/+126401
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add translations from Crowdin See merge request gitlab-org/gitlab-ce!27347 (cherry picked from commit 5c0b509316a3c1bede3417b5e7b5ff981f02e0dd) 38df06dd Add translations from Crowdin
| * | | Merge branch 'docs/merge-request-pipelines' into 'master'Achilleas Pipinellis2019-04-171-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note about MR Pipeline Runner version Closes gitlab-ee#11122 See merge request gitlab-org/gitlab-ce!27330 (cherry picked from commit 2c5398ee96799440523a03c7c770e90a9629762a) f5155180 Add note about MR Pipeline Runner version
| * | | Merge branch 'osw-remote-multi-line-suggestions-ff' into 'master'Lin Jen-Shin2019-04-172-35/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove multi-line suggestions feature flag Closes #59178 See merge request gitlab-org/gitlab-ce!27219 (cherry picked from commit fcb70d9bbbc14dc695fa87dc1dea5fa7fe78f6d2) 81da9337 Remove multi-line suggestions feature flag
| * | | Merge branch 'mc/feature/custom-metrics-ce' into 'master'Kamil Trzciński2019-04-179-28/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport metrics report type See merge request gitlab-org/gitlab-ce!26798 (cherry picked from commit c16619c527afdd00aa4dbbbf7544afb2f38477a8) 0cfa25ff Backport changes from EE
| * | | Merge branch 'nfriend-update-merge-request-widget-for-post-merge-pipelines' ↵Filipa Lacerda2019-04-1713-5/+270
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Update merge request widget to accommodate post-merge pipelines See merge request gitlab-org/gitlab-ce!25983 (cherry picked from commit cd509d991ec43b05994af1c157ef724af7f04e8f) 12170f83 Add two warning messages to the MR widget
* | | Update VERSION to 11.10.0-rc7v11.10.0-rc7GitLab Release Tools Bot2019-04-151-1/+1
| | |
* | | Merge branch '11-10-stable-prepare-rc7' into '11-10-stable'John Skarbek2019-04-13159-102/+4287
|\ \ \ | |/ / |/| | | | | | | | Prepare 11.10.0-rc7 release See merge request gitlab-org/gitlab-ce!27289
| * | Merge branch 'sh-revert-untrusted-chrome-repo' into 'master'11-10-stable-prepare-rc7Douglas Barbosa Alexandre2019-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'sh-allow-unauth-chrome' into 'master'" See merge request gitlab-org/gitlab-ce!27329 (cherry picked from commit c1ce15d687cfcc4e4b20b05f570a80507ad5cc24) 81566392 Revert "Merge branch 'sh-allow-unauth-chrome' into 'master'"