summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Update CHANGELOG.md for 8.13.6Rémy Coutable2016-11-179-33/+11
| | | [ci skip]
* Merge branch '23824-activity-page-does-not-show-commits-comments' into 'master' Robert Speicher2016-11-174-5/+36
| | | | | | | | | | | Allow commit note to be visible if repo is visible ## What does this MR do? It enforces the `:download_code` permission in `Event#visible_to_user?` for commit notes. Closes #23824 See merge request !7504
* Merge branch 'rs-issue-24527' into 'master' Sean McGivern2016-11-173-25/+41
| | | | | | | Limit labels returned for a specific project as an administrator Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24527 See merge request !7496
* Fix CHANGELOG and remove a spec meant to be on 8.14 onlyRémy Coutable2016-11-162-75/+0
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '24392-lfs-helper-refactor' into 'master' Douwe Maan2016-11-152-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Move the `objects` method to `LfsHelper` so that it is also available to `LfsStorageController` ## What does this MR do? Move the `objects` method to `LfsHelper` so that it is also available to `LfsStorageController` It is needed for the `lfs_check_access!` callback when the repository size limit is enabled (EE only). cc @stanhu @ahanselka ## Why was this MR needed? Errors shown here: gitlab-org/gitlab-ce#24392 Discovered thanks to gitlab-com/infrastructure#302 ## What are the relevant issue numbers? Fixes #24392 Fixes gitlab-com/support-forum#1280 See merge request !7417
* Merge branch '24397-load-labels-on-mr-tabs' into 'master' Sean McGivern2016-11-153-0/+30
| | | | | | | Ensure labels are loaded for all "show" methods of MR Controller Closes #24397 See merge request !7416
* Merge branch 'fix-cache-for-commit-status' into 'master' Rémy Coutable2016-11-152-1/+5
| | | | | | | | | Fix cache for commit status in commits list to respect branches Fix cache for commit status in commits list to respect branches Closes #24324 See merge request !7372
* Merge branch 'fix-uncheckable-label-for-force_remove_source_branch' into ↵Robert Speicher2016-11-152-1/+5
| | | | | | | | | | | | | 'master' Clicking "force remove source branch" label now toggles the checkbox again We remove the ID from the hidden tag for `merge_request[force_remove_source_branch]` in order to fix the checkbox toggling when the associated label is clicked. The issue was introduced by !7267 and discovered in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7267#note_18028311. See merge request !7356
* Merge branch 'split-out-markdown-cache-update' into 'master' Yorick Peterse2016-11-151-1/+5
| | | | | Split out markdown cache storage into a separate method See merge request !7277
* Merge branch '24038-fix-no-register-pane-if-ldap' into 'master' Sean McGivern2016-11-152-0/+7
| | | | | | | Fix no "Register" tab if ldap auth is enabled (#24038) Closes #24038 See merge request !7274
* Merge branch 'issue_20245' into 'master' Robert Speicher2016-11-153-1/+25
| | | | | | | Fix project Visibility level selector not using default values closes #20245 See merge request !7264
* Merge branch 'adam-fix-wiki-links-markdown' into 'master' Sean McGivern2016-11-152-1/+46
| | | | | | | Fix relative links in Markdown wiki when displayed in "Project" tab Refers to #23806 See merge request !7218
* Merge branch 'add-special-char-tests-for-refs-dropdown' into 'master' Fatih Acet2016-11-151-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test for refs dropdown selection with special chars ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7175
* Merge branch '23713-milestone-dropdown-not-selected' into 'master'Robert Speicher2016-11-153-2/+82
| | | | | | | | | | Milestone dropdown does not stay selected Closes #23713 See merge request !7117 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '23520-mr-sticky-tabs-overlap-discussion-from-anchor' into 'master'Fatih Acet2016-11-152-8/+19
| | | | | | | | | | | | | | Account for fixed position MR when scrolling to elements This MR accounts for the new merge request fixed affix bar when scrolling to an element on the MR page. The fixed MR tabs bar was not being taken into account when shifting permalink scroll targets so that they are unobscured by navigation elements. Closes #23520 See merge request !7051 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'fix_saml_ldap_link' into 'master' Douwe Maan2016-11-153-1/+29
| | | | | | | Omniauth auto link LDAP user falls back to find by DN when user cannot be found by uid Unfortunately, SAML IDs can be an LDAP UID, DN, or something else entirely. UID and DN are most common, though. This adds a fallback scenario so we first try to find a matching LDAP user by UID, then by DN. This will fix a problem for the customer in https://gitlab.zendesk.com/agent/tickets/43298 See merge request !7002
* Add 8.13.5 CHANGELOGRémy Coutable2016-11-092-4/+4
| | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* Update VERSION to 8.13.5v8.13.5Alejandro Rodríguez2016-11-081-1/+1
|
* Merge branch 'unauthenticated-container-registry-access' into 'security' Alejandro Rodriguez2016-11-084-10/+32
| | | | | | | | | Restore unauthenticated access to public container registries Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24284 /cc @stanhu @kamil @pablo See merge request !2025
* Add date for the 8.13.4 releaseRémy Coutable2016-11-071-1/+1
| | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* Update VERSION to 8.13.4v8.13.4Rémy Coutable2016-11-071-1/+1
|
* Update CHANGELOG.md for 8.13.4Rémy Coutable2016-11-078-28/+7
| | | [ci skip]
* Fix ref not passed to commit partialRémy Coutable2016-11-071-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'markdown-xss-fix-option-2.1' into 'security'Douwe Maan2016-11-073-10/+54
| | | | | | | | | | | | Fix for HackerOne XSS vulnerability in markdown This is an updated blacklist patch to fix https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2007. No text is removed. Dangerous schemes/protocols and invalid URIs are left intact but not linked. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23153 See merge request !2015 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '24059-post-facto-fixups' into 'master' Douwe Maan2016-11-073-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixups to "Round-robin repository storage" ## What does this MR do? * Simplifies a method in application_settings.rb * Correctly marks a migration as needing downtime * Documents the requirement for renamed columns to be ## Are there points in the code the reviewer needs to double check? Should any of these changes be split out? Ideally we'd get this into the same point release as !7273 ## Why was this MR needed? Post-facto review of !7273 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [X] API support added - Tests - [X] Added for this feature/bug - [x] All builds are passing - [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [X] Branch has no merge conflicts with `master` (if it does - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Related to #24059 /cc @yorickpeterse @rspeicher See merge request !7287
* Merge branch 'show-status-from-branch' into 'master'Rémy Coutable2016-11-0419-43/+139
| | | | | | | | | | Show pipeline status from branch and commit than only commit Closes #23615 See merge request !7034 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '24059-round-robin-repository-storage' into 'master'Douwe Maan2016-11-0416-25/+147
| | | | | | | | | | | | | | | | | | Resolve "Introduce round-robin project creation to spread load over multiple shards" Allow multiple shards to be enabled in the admin settings page, balancing project creation across all enabled shards. * `f.select ..., multiple: true` isn't the most beautiful UI in the world, but switching to `collection_check_boxes` (or a facsimile thereof) isn't trivial * Should `pick_repository_storage` be a method of `ApplicationSetting`, or `Project`? It's going to accrete logic over time so perhaps it should be its own class already? * This is written to avoid the need for a database migration, so it is`serialize :repository_storage` without `, Array`. This is tested, but alternatives include: * Add a database migration * Write a custom Coder that will accept a String or Array in `load` and always `dump an Array. Closes #24059 See merge request !7273 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge remote-tracking branch 'origin/labels-api'Rémy Coutable2016-11-044-8/+18
| | | | | | See merge request !7014 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '22271-drone-tag-pipeline-build' into 'master'Douwe Maan2016-11-0418-87/+161
| | | | | | | | | | Fix lightweight tags not processed correctly by GitTagPushService Closes #22271 See merge request !6532 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch ↵Sean McGivern2016-11-044-3/+20
| | | | | | | | '24102-cannot-unselect-remove-source-branch-when-editing-merge-request' into 'master' Fixes #24102 See merge request !7267
* Merge branch '23961-can-t-share-project-with-groups' into 'master' Robert Speicher2016-11-042-1/+5
| | | | | | | Only skip group when it's actually a group in the "Share with group" select Fixes #23961 See merge request !7262
* Merge branch 'issue_23242' into 'master'Sean McGivern2016-11-0410-43/+70
| | | | | | | | | | Fix project features default values closes #23242 See merge request !7181 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'issue_23951' into 'master'Sean McGivern2016-11-043-1/+22
| | | | | | | | | | Fix builds tab visibility closes #23951 See merge request !7178 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'optimize/labels-finder' into 'master'Sean McGivern2016-11-0410-29/+39
| | | | | | | | | | | | Optimize group labels page Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23684 Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/1148 See merge request !7123 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'allow-owner-to-run-ci-builds' into 'master'Rémy Coutable2016-11-046-9/+66
| | | | | | | | | | | | | | Allow owners to fetch source code in CI builds Due to different way of handling owners of a project, they were not allowed to fetch CI sources for project. This adds a separate code path for handling owners, that are not admins. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23437 See merge request !6943 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '23403-fix-events-for-private-project-features' into 'security' Robert Speicher2016-11-046-30/+163
| | | | | | | | | Respect project visibility settings in the contributions calendar This MR fixes a number of bugs relating to access controls and date selection of events for the contributions calendar Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23403 See merge request !2019
* Merge branch 'fix-unathorized-cloning' into 'security' Douwe Maan2016-11-0412-47/+191
| | | | | | | Ensure external users are not able to clone disabled repositories. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23788 See merge request !2017
* Merge branch 'issue_23548_dev' into 'master'Douwe Maan2016-11-0430-131/+321
| | | | | | | | | | | | | | | | | | | | | disable markdown in comments when referencing disabled features fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23548 This MR prevents the following references when tool is disabled: - issues - snippets - commits - when repo is disabled - commit range - when repo is disabled - milestones This MR does not prevent references to repository files, since they are just markdown links and don't leak information. See merge request !2011 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '22481-honour-issue-visibility-for-groups' into 'security'Douwe Maan2016-11-049-25/+143
| | | | | | | | | | | | Honour issue and merge request visibility in their respective finders This MR fixes a security issue with the IssuesFinder and MergeRequestFinder where they would return items the user did not have permission to see. This was most visible on the issue and merge requests page for a group containing projects that had set their issues or merge requests to "private". Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22481 See merge request !2000 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Add 8.13.3 CHANGELOG entriesRémy Coutable2016-11-031-0/+5
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Update VERSION to 8.13.3v8.13.3Robert Speicher2016-11-021-1/+1
|
* Fixed Import/Export foreign key issue to do with project membersJames Lopez2016-11-014-14/+34
|
* Removes any symlinks before importing a project export file. Also added ↵James Lopez2016-11-017-4/+105
| | | | relevant spec.
* Update VERSION to 8.13.2v8.13.2Rémy Coutable2016-10-311-1/+1
|
* Fix CHANGELOGRémy Coutable2016-10-311-201/+174
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch ↵Rémy Coutable2016-10-312-8/+195
| | | | | | | | | | | | '23872-members-of-group-that-has-project-access-getting-404-on-accessing-a-project-issue' into 'master' Fix project member access for group links Closes #23872. See merge request !7144 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '23866-builds-dropdown' into 'master'Fatih Acet2016-10-311-2/+2
| | | | | | | | | | | | | | | Increase z index on fixed mr tabs Before: <img src="/uploads/e890a4f185af87b66251d744fbe840d5/Screen_Shot_2016-10-26_at_11.58.45_AM.png" width="400px"> After: <img src="/uploads/0bbf72888f6a47bd3027ee7dfff542da/Screen_Shot_2016-10-26_at_11.58.28_AM.png" width="400px"> Closes #23866 See merge request !7124 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'adam-fix-labels-find-or-create' into 'master'Douwe Maan2016-10-3110-46/+70
| | | | | | | | | | | | Pass user instance to Labels::FindOrCreateService or skip_authorization: true It fixes a bug described in #23694 when `project.owner` was passed to `Labels::FindOrCreateService`. `Labels::FindOrCreateService` expected a user instance and `project.owner` may return a group as well. This MR makes sure that we either pass a user instance or `skip_authorization: true`. Fixes #23694 See merge request !7093 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch ↵Annabel Dunstone Gray2016-10-311-1/+1
| | | | | | | | | | | | | | | | '23661-lacking-padding-on-syntax-highlight-blocks-in-diff-comments' into 'master' Resolve "Lacking padding on syntax highlight blocks in diff comments" Enforces horizontal padding on highlight block. There was no horizontal padding on diff comment highlight blocks. Closes #23661 See merge request !7062 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch ↵Fatih Acet2016-10-311-1/+1
| | | | | | | | | | | | | | '21248-wrong-urlencoding-when-switching-branch-in-graphs-contributers' into 'master' Fix refs dropdown selection with special characters Remove unneeded encode from the project-refs-dropdown renderRow method. Closes #21248 See merge request !7061 Signed-off-by: Rémy Coutable <remy@rymai.me>