summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* add index for doc/administration/operations/docs-add-index-to-operationsMarcia Ramos2017-12-114-9/+19
|
* Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'Winnie Hellmann2017-12-1114-46/+231
|\ | | | | | | | | Pick 10.2.4 security fixes into master See merge request gitlab-org/gitlab-ce!15821
| * Resolve conflicts in app/models/user.rbmk-pick-10-2-4-security-fixesDouwe Maan2017-12-111-27/+7
| |
| * Manually add 10.2.4 changelog entriesMichael Kozono2017-12-084-15/+11
| |
| * Merge branch 'note-preview' into 'security-10-2'Fatih Acet2017-12-082-1/+17
| | | | | | | | | | | | | | | | | | prevent potential XSS when editing comment See merge request gitlab/gitlabhq!2238 (cherry picked from commit 80ed6d25a46c0f70ec8baea78b5777118d63876c) 7480e462 prevent potential XSS when editing comment
| * Merge branch 'issue_30663' into 'security-10-2'Sean McGivern2017-12-083-0/+21
| | | | | | | | | | | | | | | | | | Prevent creating issues through API without having permissions See merge request gitlab/gitlabhq!2225 (cherry picked from commit c298bbaa88883343dc9cbbb6abec0808fb3b546c) 915b97c5 Prevent creating issues through API without having permissions
| * Merge branch 'rs-security-group-api' into 'security-10-2'Douwe Maan2017-12-083-2/+82
| | | | | | | | | | | | | | | | | | [10.2] Ensure we expose group projects using GroupProjectsFinder See merge request gitlab/gitlabhq!2234 (cherry picked from commit 072f8f2fd6ec794645375a16ca4ddc1cbeb76d7a) a2240338 Ensure we expose group projects using GroupProjectsFinder
| * Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2'Douwe Maan2017-12-084-28/+60
| | | | | | | | | | | | | | | | | | | | | | | | (10.2) Avoid partial partial email adresses for matching See merge request gitlab/gitlabhq!2232 (cherry picked from commit 081aa1e91a777c9acb31be4a1e76b3dd7032fa9a) There are unresolved conflicts in app/models/user.rb. fa85a3fd Don't allow searching for partial user emails
| * Merge branch '36679-non-authorized-user-may-see-wikis-or-pipeline-page' into ↵Douwe Maan2017-12-084-11/+71
| | | | | | | | | | | | | | | | | | | | | | 'security-10-2' Fixes project visibility guidelines See merge request gitlab/gitlabhq!2226 (cherry picked from commit 877c42c0aaf3298d6001614c9706bc366ae4014c) e4fd1c26 Ensure project wiki visibility guidelines are met
* | Merge branch 'recaptcha_check_if_spammable_ce_backport' into 'master'Sean McGivern2017-12-111-2/+8
|\ \ | | | | | | | | | | | | Add recaptcha_check_if_spammable for issualbes than arent spammables See merge request gitlab-org/gitlab-ce!15817
| * | Add recaptcha_check_if_spammable for issualbes than arent spammablesrecaptcha_check_if_spammable_ce_backportLuke Bennett2017-12-081-2/+8
| | |
* | | Merge branch 'bw-todo-count-expiration' into 'master'Sean McGivern2017-12-111-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Todo count calculations now expired quicker for top bar stats See merge request gitlab-org/gitlab-ce!15794
| * | | expire todo count calculations to be consistent withbw-todo-count-expirationBrett Walker2017-12-081-2/+2
| | | | | | | | | | | | | | | | assigned_open_merge_requests_count and assigned_open_issues_count, which are used in the top header stats. Also important for a Geo secondary, so that the pending todo stat gets updated on the same frequency as the users open issues/merge requests.
* | | | Merge branch 'qa_extract_push_to_scenario' into 'master'Grzegorz Bizon2017-12-113-15/+55
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Turn" push a file" into a scenario See merge request gitlab-org/gitlab-ce!15617
| * | | | Check if user is in project page before performing a pushqa_extract_push_to_scenarioFelipe Artur2017-12-071-0/+7
| | | | |
| * | | | Turn push file into a scenarioFelipe Artur2017-12-073-15/+48
| | | | |
* | | | | Merge branch 'fix-image-view-mode' into 'master'Filipa Lacerda2017-12-112-2/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix image view mode Closes #40945 See merge request gitlab-org/gitlab-ce!15803
| * | | | | Fix image view modeClement Ho2017-12-112-2/+14
|/ / / / /
* | | | | Merge branch 'es-module-compare' into 'master'Filipa Lacerda2017-12-114-86/+73
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Convert Compare and CompareAutocomplete classes into ES module syntax See merge request gitlab-org/gitlab-ce!14857
| * | | | | revert arrow function changees-module-compareMike Greiling2017-11-301-1/+1
| | | | | |
| * | | | | convert CompareAutocomplete from class definition into simple function call, ↵Mike Greiling2017-11-303-65/+56
| | | | | | | | | | | | | | | | | | | | | | | | remove global export
| * | | | | convert Compare class into ES module import/export syntaxMike Greiling2017-11-303-4/+3
| | | | | |
| * | | | | refactor Compare class to ES class syntaxMike Greiling2017-11-301-18/+16
| | | | | |
| * | | | | remove commits.js import form main.js (related to !14735)Mike Greiling2017-11-301-1/+0
| | | | | |
* | | | | | Merge branch 'sh-fix-import-rake-task' into 'master'James Lopez2017-12-115-0/+32
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gitlab:import:repos Rake task moving repositories into the wrong location Closes #40765 See merge request gitlab-org/gitlab-ce!15823
| * | | | | Remove the need for destroy and add a comment in the specStan Hu2017-12-101-4/+3
| | | | | |
| * | | | | Use build instead of create in importer specStan Hu2017-12-101-1/+1
| | | | | |
| * | | | | Simplify normalizing of pathsStan Hu2017-12-101-4/+3
| | | | | |
| * | | | | Fix failing importer test case on MySQL due to missing trailing slash in ↵sh-fix-import-rake-taskStan Hu2017-12-083-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | root path
| * | | | | Fix gitlab:import:repos Rake task moving repositories into the wrong locationStan Hu2017-12-083-0/+20
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the source import directory were different from the destination directory, GitLab would first create a blank repository and then erroneously move the original one into a subdirectory. Adding an import type prevents this the project from being initialized in the first place. It was accidentally removed in 1f917cbd49. Closes #40765
* | | | | Merge branch 'docs/improve-limit-conflicts-with-ee' into 'master'Robert Speicher2017-12-087-355/+110
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Move the "Limit conflicts with EE" doc to "Automatic CE-> EE merge" See merge request gitlab-org/gitlab-ce!15749
| * | | | Add "Guidelines for implementing Enterprise Edition features" in CE ↵docs/improve-limit-conflicts-with-eeRémy Coutable2017-12-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development doc since the doc page is already there Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Address Robert's and Axil's feedbackRémy Coutable2017-12-064-15/+17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Move the "Limit conflicts with EE" doc to "Automatic CE-> EE merge"Rémy Coutable2017-12-056-353/+105
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch '35385-allow-git-pull-push-on-project-redirects' into 'master'Douwe Maan2017-12-0820-52/+510
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow git pull/push on project redirects Closes #35385 See merge request gitlab-org/gitlab-ce!15670
| * | | | | Allow git pull/push on project redirectsMayra Cabrera2017-12-0820-52/+510
|/ / / / /
* | | | | Merge branch '38032-deploy-markers-should-be-more-verbose' into 'master'Mike Greiling2017-12-0812-38/+199
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Deploy markers should be more verbose" Closes #38032 See merge request gitlab-org/gitlab-ce!15641
| * | | | | Reduce the size of the deploy flag when there's no tag available38032-deploy-markers-should-be-more-verboseJose Ivan Vargas2017-12-071-3/+11
| | | | | |
| * | | | | Changed the deploy markers on the prometheus dashboard to be more verboseJose Ivan Vargas2017-12-0712-38/+191
| | | | | |
* | | | | | Merge branch '40031-include-assset_sync-gem' into 'master'Douwe Maan2017-12-084-0/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Include asset_sync gem" Closes #40031 See merge request gitlab-org/gitlab-ce!15734
| * | | | | | Resolve "Include asset_sync gem"Ian Baum2017-12-084-0/+45
|/ / / / / /
* | | | | | Merge branch 'fix-event-target-author-preloading' into 'master'Douwe Maan2017-12-082-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix N+1 query when displaying events See merge request gitlab-org/gitlab-ce!15788
| * | | | | | Fix N+1 query when displaying eventsfix-event-target-author-preloadingYorick Peterse2017-12-082-1/+6
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When displaying events we would load the target of those events, then render the entire data using our Markdown pipeline. This pipeline would eventually request the author of every target, leading to an additional query being executed for every target to get the author. To fix this we now eager load the author of the event's target. In my local environment this reduces the number of queries to display a project's Atom feed from 40 to 24 queries. See https://gitlab.com/gitlab-org/gitlab-ce/issues/36878 for more information.
* | | | | | Merge branch 'jprovazn-ignore-anchors' into 'master'Sean McGivern2017-12-084-0/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use prefix for TableOfContents filter hrefs Closes #38473 See merge request gitlab-org/gitlab-ce!15806
| * | | | | | Use prefix for TableOfContents filter hrefsJan Provaznik2017-12-084-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TableOfContents filter generates hrefs for each header in markdown, if the header text consists from digits and redacted symbols only, e.g. "123" or "1.0 then the auto-generated href has the same format as issue references. If the generated id contains only digits, then 'anchor-' prefix is prepended to the id. Closes #38473
* | | | | | | Merge branch 'fix/gb/fix-pipeline-build-chain-tag-evaluation' into 'master'Douwe Maan2017-12-0816-111/+367
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix invalid pipeline build chain tag evaluation Closes #40944 See merge request gitlab-org/gitlab-ce!15805
| * | | | | | | Fix RubocopKamil Trzcinski2017-12-081-1/+1
| | | | | | | |
| * | | | | | | Add Chain::Command specsfix/gb/fix-pipeline-build-chain-tag-evaluationKamil Trzcinski2017-12-084-10/+190
| | | | | | | |
| * | | | | | | Fix a bug of before_sha being inproperly evaluated to `checkout_sha`Kamil Trzcinski2017-12-081-5/+1
| | | | | | | |
| * | | | | | | Implement and use Gitlab::Ci::Pipeline::Chain::CommandKamil Trzcinski2017-12-0814-127/+146
| | | | | | | |
View Lorry Controller Status