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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \| \| \| \|	Find the EE branch by searching the branches	Lin Jen-Shin	2018-07-11	1	-8/+20
\| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This uses a similar approach in ee_specific_check.rb
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'runners-max-timeout-param' into 'master'	Rémy Coutable	2018-07-11	3	-1/+69
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing maximum_timeout parameter Closes #48625 See merge request gitlab-org/gitlab-ce!20355
\| * \| \| \| \| \| \| \| \| \| \|	Add missing maximum_timeout parameter	gfyoung	2018-07-11	3	-1/+69
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rails5-autoload' into 'master'	Sean McGivern	2018-07-11	1	-1/+11
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Rails5] Permit concurrent loads Closes #48263 See merge request gitlab-org/gitlab-ce!20473
\| * \| \| \| \| \| \| \| \| \| \|	[Rails5] Permit concurrent loads	Jan Provaznik	2018-07-10	1	-1/+11
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails 5 introduced a new (and safer) autoload mechanism which uses locking when loading missing constants. Under some circumstances it's possible that a deadlock occurs in multi-threaded environment (especially when running capybara tests) To avoid these deadlocks, concurrent load is enabled when loading policies - we ere hitting timeout in this case: https://gitlab.com/gitlab-org/gitlab-ce/issues/48263 Note that autoloading is enabled only in development or test envs (not in production).
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-doc-on-migration' into 'master'	Sean McGivern	2018-07-11	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix doc for large table column rename See merge request gitlab-org/gitlab-ce!20544
\| * \| \| \| \| \| \| \| \| \|	Fix doc for large table column rename	Mark Chao	2018-07-11	1	-2/+2
\| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-handle-colons-in-url-passwords' into 'master'	James Lopez	2018-07-11	3	-1/+7
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly handle colons in URL passwords Closes #49080 See merge request gitlab-org/gitlab-ce!20538
\| * \| \| \| \| \| \| \| \|	Properly handle colons in URL passwords	Stan Hu	2018-07-10	3	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before b46d5b13ecb8e0c0793fa433bff7f49cb0612760, we relied on `Addressable::URI` to parse the username/password in a URL, but this failed when credentials contained special characters. However, this introduced a regression where the parsing would incorrectly truncate the password if the password had a colon. Closes #49080
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-git-gc-error-handling' into 'master'	Robert Speicher	2018-07-10	2	-2/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ArgumentError in GitGarbageCollectWorker Sidekiq job Closes #49096 See merge request gitlab-org/gitlab-ce!20541
\| * \| \| \| \| \| \| \| \| \|	Fix ArgumentError in GitGarbageCollectWorker Sidekiq job	Stan Hu	2018-07-10	2	-2/+8
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the Gitaly call failed, the exception handling failed because `method` is expected to have a parameter. Closes #49096
* \| \| \| \| \| \| \| \| \|	Merge branch 'winh-speedup-smartinterval-tests' into 'master'48657-persist-auto-devops-banner-dismissal-per-user-cookie	Mike Greiling	2018-07-10	3	-99/+130
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mock timeouts and Promise in SmartInterval tests See merge request gitlab-org/gitlab-ce!20496
\| * \| \| \| \| \| \| \| \|	Mock timeouts and Promise in SmartInterval tests	Winnie Hellmann	2018-07-10	3	-99/+130
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'bvl-remove-pot-timestamps' into 'master'	Rémy Coutable	2018-07-10	2	-3/+7
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove timestamps from `locale/gitlab.pot` Closes #49077 See merge request gitlab-org/gitlab-ce!20533
\| * \| \| \| \| \| \| \|	Remove timestamps from `locale/gitlab.pot`	Bob Van Landuyt	2018-07-10	2	-3/+7
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will help us avoid conflicts when regenerating the pot file, the timestamps aren't used by Crowdin.
* \| \| \| \| \| \| \|	Merge branch 'add-dst-support-to-pipeline-schedule' into 'master'	Kamil Trzciński	2018-07-10	2	-1/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add daylight saving time support for pipeline schedules Closes #37165 See merge request gitlab-org/gitlab-ce!20145
\| * \| \| \| \| \| \| \|	Add daylight saving time support for pipeline schedules	Collen	2018-07-10	2	-1/+6
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'fix-conflicts-exception-for-submodules' into 'master'	Rémy Coutable	2018-07-10	4	-15/+31
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure ConflictsService does not raise for conflicting submodules See merge request gitlab-org/gitlab-ce!20528
\| * \| \| \| \| \| \| \|	Make sure ConflictsService does not raise for conflicting submodules	Sean McGivern	2018-07-10	4	-15/+31
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'patch-28' into 'master'	Rémy Coutable	2018-07-10	2	-4/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a typo on CI Runner page on Projects See merge request gitlab-org/gitlab-ce!20467
\| * \| \| \| \| \| \| \|	Fix a typo on CI Runner page on Projects	Ave	2018-07-10	2	-4/+4
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch ↵	Robert Speicher	2018-07-10	2	-17/+27
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'rd-6804-bug-unable-to-delete-branches-when-repo-reaches-the-size-limit-ce' into 'master' Backport some changes from EE See merge request gitlab-org/gitlab-ce!20388
\| * \| \| \| \| \| \| \|	Backport some changes from EE	Rubén Dávila	2018-07-09	2	-17/+27
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'revert-3755d828' into 'master'	Phil Hughes	2018-07-10	3	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'" See merge request gitlab-org/gitlab-ce!20525
\| * \| \| \| \| \| \| \|	Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'"	Winnie Hellmann	2018-07-10	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !20140
* \| \| \| \| \| \| \| \|	Merge branch '49057-fix-repository-typo' into 'master'	Rémy Coutable	2018-07-10	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a typo in Gitlab::Git::Repository See merge request gitlab-org/gitlab-ce!20520
\| * \| \| \| \| \| \| \| \|	Fix a typo? gitaly_operation{-s-}_client	Lin Jen-Shin	2018-07-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '48578-disable-gcp-free-credit-banner-at-instance-level' into ↵	Rémy Coutable	2018-07-10	12	-3/+77
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Disable GCP free credit banner at instance level" Closes #48578 See merge request gitlab-org/gitlab-ce!20379
\| * \| \| \| \| \| \| \| \|	Resolve "Disable GCP free credit banner at instance level"	Dennis Tang	2018-07-10	12	-3/+77
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'docs/codequality' into 'master'	Marcia Ramos	2018-07-10	5	-53/+59
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename code climate to code quality See merge request gitlab-org/gitlab-ce!20506
\| * \| \| \| \| \| \| \|	Rename code climate to code quality	Achilleas Pipinellis (🌴 July 10 - July 20 🌴)	2018-07-10	5	-53/+59
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'ce-6117-unify-preview-mailer' into 'master'	Sean McGivern	2018-07-10	1	-0/+11
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Resolve "Extract EE specific files/lines for spec/mailers, app/mailers/preview" See merge request gitlab-org/gitlab-ce!20508
\| * \| \| \| \| \| \|	This test was copied from EE	Lin Jen-Shin	2018-07-10	1	-0/+11
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'rails5-mysql-rename-column' into 'master'	Yorick Peterse	2018-07-10	2	-0/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 MySQL fix rename_column as part of cleanup_concurrent_column_type_change for timestamps See merge request gitlab-org/gitlab-ce!20514
\| * \| \| \| \| \| \|	Rails5 MySQL fix rename_column as part of cleanup_concurrent_column_type_change	Jasper Maes	2018-07-09	2	-0/+10
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'rd-ee-backport-add-support-for-gl-com-trials' into 'master'	Sean McGivern	2018-07-10	1	-6/+6
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport some changes made for this spec in EE See merge request gitlab-org/gitlab-ce!20318
\| * \| \| \| \| \|	Backport some changes made for this spec in EE	Rubén Dávila	2018-07-02	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With these changes this file will have the same content on EE
* \| \| \| \| \| \|	Merge branch 'docs-bitbucket-typo' into 'master'	Rémy Coutable	2018-07-10	1	-9/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update bitbucket.md to fix typo and small grammar touchups. See merge request gitlab-org/gitlab-ce!20482
\| * \| \| \| \| \| \|	Update bitbucket.md to fix typo and small grammar touchups.	Marcel Amirault	2018-07-10	1	-9/+9
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'syntax-test-branch' into 'master'	Rémy Coutable	2018-07-10	2	-6/+12
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update time_helper.rb to fix output for exact minutes. Closes #48948 See merge request gitlab-org/gitlab-ce!20479
\| * \| \| \| \| \| \|	Update time_helper.rb to fix output for exact minutes.	Marcel Amirault	2018-07-10	2	-6/+12
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'rjh/doc-update-for-gitlab-pages' into 'master'	Rémy Coutable	2018-07-10	2	-5/+31
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document update for GitLab Pages users. See merge request gitlab-org/gitlab-ce!20412
\| * \| \| \| \| \| \|	Document update for GitLab Pages users.	Richard Hancock	2018-07-10	2	-5/+31
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'fix-api-docs-simple-projects' into 'master'	Rémy Coutable	2018-07-10	1	-4/+39
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix API docs around unauthenticated projects return fields See merge request gitlab-org/gitlab-ce!20477
\| * \| \| \| \| \| \|	Fix API docs on unauthenticated projects return	Kaspar Emanuel	2018-07-09	1	-4/+39
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'gitaly-mandatory-20180709-jv' into 'master'	Douwe Maan	2018-07-10	5	-186/+73
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Gitaly for fetches and creating bundles Closes gitaly#387, gitaly#874, gitaly#750, and gitaly#665 See merge request gitlab-org/gitlab-ce!20490
\| * \| \| \| \| \| \| \|	Use Gitaly for fetches and creating bundles	Jacob Vosmaer	2018-07-09	5	-186/+73
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'improve-metadata-access-performance' into 'master'	Grzegorz Bizon	2018-07-10	15	-317/+431
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve metadata access performance See merge request gitlab-org/gitlab-ce!20493
\| * \| \| \| \| \| \| \|	Fix specs	Kamil Trzciński	2018-07-09	3	-13/+13
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix and add specs for testing metadata entry	Kamil Trzciński	2018-07-09	8	-97/+172
\| \| \| \| \| \| \| \| \|