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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Move Repository#write_ref to Git::Repository#write_refrepo-write-ref-client-prep	Kim "BKC" Carlbäcker	2017-12-12	5	-16/+35
\|
*	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.
* \| \| \| \|	Merge branch '40754-fix-flash-usage-with-personal-access-token' into 'master'	Grzegorz Bizon	2017-12-08	4	-5/+52
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix new personal access token showing up in a flash message Closes #40754 See merge request gitlab-org/gitlab-ce!15707
\| * \| \| \| \|	Fix new personal access token showing up in a flash message40754-fix-flash-usage-with-personal-access-token	Eric Eastwood	2017-12-07	4	-5/+52
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'jprovazn-testfix2' into 'master'	Stan Hu	2017-12-08	1	-5/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean test path between merge request handler tests Closes #40900 See merge request gitlab-org/gitlab-ce!15792
\| * \| \| \| \| \|	Clean test path between merge request handler testsjprovazn-testfix2	Jan Provaznik	2017-12-07	1	-5/+5
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	create_merge_request_handler_spec needs a repository for some tests but this repository lasts on disk by default which causes failures of other tests. TestEnv.clean_test_path is used to get rid of the repository after each test. Closes #40900
* \| \| \| \| \|	Merge branch 'gitaly-795-migrate-repository-fsck' into 'master'	Robert Speicher	2017-12-08	2	-2/+27
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Git::Repository#fsck to Gitaly Closes gitaly#795 See merge request gitlab-org/gitlab-ce!15731
\| * \| \| \| \| \|	Migrate Git::Repository#fsck to Gitaly	Kim Carlbäcker	2017-12-08	2	-2/+27
\|/ / / / / /
* \| \| \| \| \|	Merge branch '40825-use-relative-path-urls' into 'master'	Robert Speicher	2017-12-07	11	-14/+31
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use relative _path helper URLs in the GitLab UI Closes #40825 See merge request gitlab-org/gitlab-ce!15738
\| * \| \| \| \| \|	Use relative _path helper URLs in the GitLab UI40825-use-relative-path-urls	Eric Eastwood	2017-12-07	11	-14/+31
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40825
* \| \| \| \| \|	Merge branch ↵	Jacob Schatz	2017-12-07	2	-2/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40555-replace-absolute-urls-with-related-branches-to-avoid-hostname' into 'master' Replace absolute URLs on related branches/MRs with relative url to avoid hostname Closes #40555 See merge request gitlab-org/gitlab-ce!15735
\| * \| \| \| \| \|	Replace absolute URLs on related branches/MRs with relative url to avoid ↵40555-replace-absolute-urls-with-related-branches-to-avoid-hostname	Eric Eastwood	2017-12-04	2	-2/+8
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	hostname
* \| \| \| \| \|	Merge branch 'acet-fix-branches-list-on-cherry-pick-modal-after-merge' into ↵	Jacob Schatz	2017-12-07	2	-0/+14
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix loading branches list on cherry pick modal after merge. Closes #33894 See merge request gitlab-org/gitlab-ce!15306
\| * \| \| \| \| \|	Fix loading branches list on cherry pick modal after merge.acet-fix-branches-list-on-cherry-pick-modal-after-merge	Fatih Acet	2017-12-04	2	-0/+14
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'use-us-english' into 'master'	Jacob Schatz	2017-12-07	1	-0/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation about using US-English Closes #40675 See merge request gitlab-org/gitlab-ce!15656
\| * \| \| \| \| \| \|	Add documentation about using US-English	Clement Ho	2017-12-07	1	-0/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'fix-transient-datefix-spec' into 'master'	Jacob Schatz	2017-12-07	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix transient error in pikadayToString Closes #40858 See merge request gitlab-org/gitlab-ce!15754
\| * \| \| \| \| \| \|	Fix transient error in pikadayToStringfix-transient-datefix-spec	Clement Ho	2017-12-05	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix_39233' into 'master'	Sean McGivern	2017-12-07	3	-1/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix #39233 - 500 in merge request Closes #39233 See merge request gitlab-org/gitlab-ce!15774
\| * \| \| \| \| \| \| \|	fix #39233 - 500 in merge request	Martin Nowak	2017-12-07	3	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- handle unchanged empty lines in inline diff
* \| \| \| \| \| \| \| \|	Merge branch 'feature/sm/34834-missing-dependency-should-fail-job-2' into ↵	Kamil Trzciński	2017-12-07	10	-5/+272
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Dependency validator Closes #34834 See merge request gitlab-org/gitlab-ce!14009
\| * \| \| \| \| \| \| \|	Clean up docs for dependencies validationfeature/sm/34834-missing-dependency-should-fail-job-2	Achilleas Pipinellis	2017-12-07	3	-16/+63
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Test for both ci_disable_validates_dependencies true/false	Shinya Maeda	2017-12-08	2	-78/+129
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Change feature flag to ci_disable_validates_dependencies to enable it as default	Shinya Maeda	2017-12-07	3	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update document to use ci_validates_dependencies	Shinya Maeda	2017-12-07	2	-10/+12
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix pipeline	Shinya Maeda	2017-12-06	1	-1/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix tests	Shinya Maeda	2017-12-06	2	-28/+32
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix /build_spec.rb	Shinya Maeda	2017-12-06	2	-9/+14
\| \| \| \| \| \| \| \| \|