delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	updated importsurl-utility-es-module	Phil Hughes	2017-12-11	14	-29/+29
\|
*	Merge branch 'master' into 'url-utility-es-module'	Phil Hughes	2017-12-11	143	-1094/+2820
\|\ \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/issue_show/components/app.vue
\| *	Merge branch 'recaptcha_check_if_spammable_ce_backport' into 'master'	Sean McGivern	2017-12-11	1	-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_backport	Luke Bennett	2017-12-08	1	-2/+8
\| \| \|
\| * \|	Merge branch 'bw-todo-count-expiration' into 'master'	Sean McGivern	2017-12-11	1	-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-expiration	Brett Walker	2017-12-08	1	-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 Bizon	2017-12-11	3	-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_scenario	Felipe Artur	2017-12-07	1	-0/+7
\| \| \| \| \|
\| \| * \| \|	Turn push file into a scenario	Felipe Artur	2017-12-07	3	-15/+48
\| \| \| \| \|
\| * \| \| \|	Merge branch 'fix-image-view-mode' into 'master'	Filipa Lacerda	2017-12-11	2	-2/+14
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix image view mode Closes #40945 See merge request gitlab-org/gitlab-ce!15803
\| \| * \| \| \|	Fix image view mode	Clement Ho	2017-12-11	2	-2/+14
\| \|/ / / /
\| * \| \| \|	Merge branch 'es-module-compare' into 'master'	Filipa Lacerda	2017-12-11	4	-86/+73
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convert Compare and CompareAutocomplete classes into ES module syntax See merge request gitlab-org/gitlab-ce!14857
\| \| * \| \| \|	revert arrow function changees-module-compare	Mike Greiling	2017-11-30	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	convert CompareAutocomplete from class definition into simple function call, ↵	Mike Greiling	2017-11-30	3	-65/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove global export
\| \| * \| \| \|	convert Compare class into ES module import/export syntax	Mike Greiling	2017-11-30	3	-4/+3
\| \| \| \| \| \|
\| \| * \| \| \|	refactor Compare class to ES class syntax	Mike Greiling	2017-11-30	1	-18/+16
\| \| \| \| \| \|
\| \| * \| \| \|	remove commits.js import form main.js (related to !14735)	Mike Greiling	2017-11-30	1	-1/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'sh-fix-import-rake-task' into 'master'	James Lopez	2017-12-11	5	-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 spec	Stan Hu	2017-12-10	1	-4/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Use build instead of create in importer spec	Stan Hu	2017-12-10	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Simplify normalizing of paths	Stan Hu	2017-12-10	1	-4/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix failing importer test case on MySQL due to missing trailing slash in ↵sh-fix-import-rake-task	Stan Hu	2017-12-08	3	-1/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	root path
\| \| * \| \| \| \|	Fix gitlab:import:repos Rake task moving repositories into the wrong location	Stan Hu	2017-12-08	3	-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 Speicher	2017-12-08	7	-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-ee	Rémy Coutable	2017-12-06	1	-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 feedback	Rémy Coutable	2017-12-06	4	-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 Coutable	2017-12-05	6	-353/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \|	Merge branch '35385-allow-git-pull-push-on-project-redirects' into 'master'	Douwe Maan	2017-12-08	20	-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 redirects	Mayra Cabrera	2017-12-08	20	-52/+510
\| \|/ / / / /
\| * \| \| \| \|	Merge branch '38032-deploy-markers-should-be-more-verbose' into 'master'	Mike Greiling	2017-12-08	12	-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-verbose	Jose Ivan Vargas	2017-12-07	1	-3/+11
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Changed the deploy markers on the prometheus dashboard to be more verbose	Jose Ivan Vargas	2017-12-07	12	-38/+191
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch '40031-include-assset_sync-gem' into 'master'	Douwe Maan	2017-12-08	4	-0/+45
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Include asset_sync gem" Closes #40031 See merge request gitlab-org/gitlab-ce!15734
\| \| * \| \| \| \| \|	Resolve "Include asset_sync gem"	Ian Baum	2017-12-08	4	-0/+45
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'fix-event-target-author-preloading' into 'master'	Douwe Maan	2017-12-08	2	-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-preloading	Yorick Peterse	2017-12-08	2	-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 McGivern	2017-12-08	4	-0/+23
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use prefix for TableOfContents filter hrefs Closes #38473 See merge request gitlab-org/gitlab-ce!15806
\| \| * \| \| \| \| \|	Use prefix for TableOfContents filter hrefs	Jan Provaznik	2017-12-08	4	-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 Maan	2017-12-08	16	-111/+367
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix invalid pipeline build chain tag evaluation Closes #40944 See merge request gitlab-org/gitlab-ce!15805
\| \| * \| \| \| \| \| \|	Fix Rubocop	Kamil Trzcinski	2017-12-08	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add Chain::Command specsfix/gb/fix-pipeline-build-chain-tag-evaluation	Kamil Trzcinski	2017-12-08	4	-10/+190
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix a bug of before_sha being inproperly evaluated to `checkout_sha`	Kamil Trzcinski	2017-12-08	1	-5/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Implement and use Gitlab::Ci::Pipeline::Chain::Command	Kamil Trzcinski	2017-12-08	14	-127/+146
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix invalid pipeline build chain tag evaluation	Grzegorz Bizon	2017-12-08	4	-8/+69
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch ↵	Sean McGivern	2017-12-08	16	-68/+363
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'29483-no-feedback-when-checking-on-checklist-if-potential-spam-was-detected' into 'master' Resolve "No feedback when checking on checklist if potential spam was detected" Closes #29483 See merge request gitlab-org/gitlab-ce!15408
\| \| * \| \| \| \| \| \|	Resolve "No feedback when checking on checklist if potential spam was detected"	Luke Bennett	2017-12-08	16	-68/+363
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge branch 'docs/add-why-do-i-get-signed-out-authentication-section' into ↵	Sean McGivern	2017-12-08	3	-1/+31
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add docs explaining why you get signed out with "Remember me" checked See merge request gitlab-org/gitlab-ce!15756
\| \| * \| \| \| \| \| \|	Add docs explaining why you get signed out with "Remember me"docs/add-why-do-i-get-signed-out-authentication-section	Eric Eastwood	2017-12-08	3	-1/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.slack.com/archives/C101F3796/p1512486640000434
\| * \| \| \| \| \| \| \|	Merge branch 'bvl-circuitbreaker-process' into 'master'	Douwe Maan	2017-12-08	45	-362/+983
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check NFS mounts in a separate process Closes #39847 See merge request gitlab-org/gitlab-ce!15426
\| \| * \| \| \| \| \| \| \|	Move the circuitbreaker check out in a separate processbvl-circuitbreaker-process	Bob Van Landuyt	2017-12-08	45	-362/+983
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moving the check out of the general requests, makes sure we don't have any slowdown in the regular requests. To keep the process performing this checks small, the check is still performed inside a unicorn. But that is called from a process running on the same server. Because the checks are now done outside normal request, we can have a simpler failure strategy: The check is now performed in the background every `circuitbreaker_check_interval`. Failures are logged in redis. The failures are reset when the check succeeds. Per check we will try `circuitbreaker_access_retries` times within `circuitbreaker_storage_timeout` seconds. When the number of failures exceeds `circuitbreaker_failure_count_threshold`, we will block access to the storage. After `failure_reset_time` of no checks, we will clear the stored failures. This could happen when the process that performs the checks is not running.