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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix intermittently failed click in dropdownqa/mk-fix-unable-to-click-new-project-in-dropdown	Michael Kozono	2018-01-26	3	-11/+25
\| \| \| \|	I haven’t seen `go_to_new_subgroup` fail in the same way, but it seems best to modify it also.
*	Merge branch ↵	Douwe Maan	2018-01-26	11	-8/+53
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error' into 'master' Resolve "Import from GitLab.com fails (destination already exists and is not an empty directory error)." Closes #42327 See merge request gitlab-org/gitlab-ce!16714
\| *	update code based on feedback42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error	James Lopez	2018-01-26	7	-7/+16
\| \|
\| *	add changelog	James Lopez	2018-01-26	1	-0/+6
\| \|
\| *	fix spec	James Lopez	2018-01-26	1	-1/+1
\| \|
\| *	add spec	James Lopez	2018-01-26	3	-1/+14
\| \|
\| *	disable retry attempts for Import/Export until that is fixed	James Lopez	2018-01-26	3	-2/+13
\| \|
\| *	add an extra spec	James Lopez	2018-01-26	1	-1/+5
\| \|
\| *	fix validation error on services	James Lopez	2018-01-26	5	-4/+6
\|/
*	Merge branch 'fl-mr-widget-components' into 'master'	Phil Hughes	2018-01-26	7	-355/+357
\|\ \| \| \| \| \| \| \| \|	Moves components into vue files: See merge request gitlab-org/gitlab-ce!16719
\| *	Adds missing i18n	Filipa Lacerda	2018-01-26	1	-2/+2
\| \|
\| *	Merge branch 'master' into fl-mr-widget-components	Filipa Lacerda	2018-01-25	56	-272/+451
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Open links in a new tab on the user page Improve empty project overview Make Gitaly RepositoryExists opt-out Fix .batch_lfs_pointers accepting a lazy enumerator Look for rugged with static analysis Look at notes created just before merge when deciding if an MR can be reverted Cache rubocop cache for CI Update gitlab-styles and re-enable the RSpec/SingleLineHook cop again Make Gitlab::Git::Repository#run_git private Default to HTTPS for all Gravatar URLs Handle special characters on API request of issuable templates Update secret_values to support dynamic elements within parent Add note within ux documentation that further changes should be made within the design.gitlab project Disable throwOnError in KaTeX to reveal user where is the problem
\| * \|	Moves components into vue files:fl-mr-widget-components	Filipa Lacerda	2018-01-25	7	-355/+357
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- mr_widget_failed_to_merge - mr_widget_merge_when_pipeline_succeeds Adds i18n
* \| \|	Merge branch ↵	Grzegorz Bizon	2018-01-26	6	-13/+29
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'42420-follow-up-from-resolve-asset-was-not-declared-to-be-precompiled-in-production-favicon-green-ico' into 'master' Port some non-EE-specific config/ changes to CE Closes #42420 See merge request gitlab-org/gitlab-ce!16710
\| * \| \|	Port some non-EE-specific config/ changes to CE42420-follow-up-from-resolve-asset-was-not-declared-to-be-precompiled-in-production-favicon-green-ico	Rémy Coutable	2018-01-25	6	-13/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'qa/ee-4698-backport' into 'master'	Grzegorz Bizon	2018-01-26	8	-15/+92
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport QA changes from EE Closes gitlab-ee#4698 See merge request gitlab-org/gitlab-ce!16728
\| * \| \| \|	Pick EE for qa/qa/page/menu/side.rbqa/ee-4698-backport	Lin Jen-Shin	2018-01-26	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Pick the EE version for this file	Lin Jen-Shin	2018-01-26	1	-5/+5
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'upstream/master' into qa/ee-4698-backport	Lin Jen-Shin	2018-01-26	9	-4/+139
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: Just don't expand if it's already expanded fix bug in webpack_helper in which force_same_domain argument was ignored breaking local rspec tests Fix rubocop offenses introduced in !16623 Prefer local variables over given/let Try to restore page's state Add more views check Respect the latest changes from master Add a scenario for adding secret variables
\| * \| \| \| \|	Backport QA changes from EE	Gabriel Mazetto	2018-01-26	8	-11/+87
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'filipefreire_155' into 'master'	Rémy Coutable	2018-01-26	4	-0/+43
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab-qa !155 - push creates event on activity page See merge request gitlab-org/gitlab-ce!16423
\| * \ \ \ \ \	Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into ↵	Filipe Freire	2018-01-25	1	-2/+7
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	filipefreire_155
\| * \ \ \ \ \ \	Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into ↵	Filipe Freire	2018-01-25	969	-9131/+15572
\| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	filipefreire_155
\| * \| \| \| \| \| \|	improve push events selector in activity.rb	Filipe Freire	2018-01-18	1	-5/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	improve interaction with activity on side.rb	Filipe Freire	2018-01-18	1	-1/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	improvements after CR	Filipe Freire	2018-01-16	5	-28/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ move activity click to side.rb + add element check on activity.rb + minor fixes
\| * \| \| \| \| \| \|	Merge branch 'filipefreire_155' of https://gitlab.com/filipefreire/gitlab-ce ↵	Filipe Freire	2018-01-16	0	-0/+0
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into filipefreire_155
\| \| * \ \ \ \ \ \	Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into ↵	Filipe Freire	2018-01-16	256	-2086/+4021
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	filipefreire_155
\| * \| \ \ \ \ \ \ \	Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into ↵	Filipe Freire	2018-01-16	256	-2086/+4021
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| / / / / / / / \| \| \|/ / / / / / /	filipefreire_155
\| * \| \| \| \| \| \| \|	improvement after CR	Filipe Freire	2018-01-12	4	-8/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- test reaches Activity page - the actual git push seems to be failing - had problems with defining selectors
\| * \| \| \| \| \| \| \|	improvements after CR	Filipe Freire	2018-01-12	2	-9/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add relevant element for push event button	Filipe Freire	2018-01-12	1	-7/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	gitlab-qa !155 push creates event on activity page	Filipe Freire	2018-01-12	2	-0/+42
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'winh-check-axios-restore' into 'master'	Filipa Lacerda	2018-01-26	2	-0/+18
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure that axios adapater is restored after mocking See merge request gitlab-org/gitlab-ce!16660
\| * \| \| \| \| \| \| \|	Make sure that axios adapater is restored after mockingwinh-check-axios-restore	Winnie Hellmann	2018-01-25	2	-0/+18
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'qa-secret-variables-scenario' into 'master'	Grzegorz Bizon	2018-01-26	7	-1/+131
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a scenario for adding secret variables See merge request gitlab-org/gitlab-ce!16607
\| * \| \| \| \| \| \| \| \|	Just don't expand if it's already expanded	Lin Jen-Shin	2018-01-26	1	-4/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into qa-secret-variables-scenario	Lin Jen-Shin	2018-01-26	46	-355/+542
\| \|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: fix bug in webpack_helper in which force_same_domain argument was ignored breaking local rspec tests Fix rubocop offenses introduced in !16623 fix documentation about node version Ensure the job also run for tags Open links in a new tab on the user page Improve empty project overview Look for rugged with static analysis Cache rubocop cache for CI Update gitlab-styles and re-enable the RSpec/SingleLineHook cop again Make Gitlab::Git::Repository#run_git private Move user page spinach tests to RSpec Handle special characters on API request of issuable templates Update secret_values to support dynamic elements within parent Disable throwOnError in KaTeX to reveal user where is the problem Migrate restoring repo from bundle to Gitaly
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-local-rspec-tests' into 'master'	Mike Greiling	2018-01-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix local RSpec tests due to bug in `webpack_bundle_tag` Closes #42368 See merge request gitlab-org/gitlab-ce!16724
\| * \| \| \| \| \| \| \| \|	fix bug in webpack_helper in which force_same_domain argument was ignored ↵fix-local-rspec-tests	Mike Greiling	2018-01-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	breaking local rspec tests
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix/rubocop-offenses-in-repo-spec' into 'master'	Robert Speicher	2018-01-25	1	-2/+7
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix rubocop offenses introduced in !16623 See merge request gitlab-org/gitlab-ce!16722
\| * \| \| \| \| \| \| \| \|	Fix rubocop offenses introduced in !16623	Ahmad Sherif	2018-01-25	1	-2/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'update-node-docs' into 'master'	Jacob Schatz	2018-01-25	3	-8/+11
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix documentation about node version Closes #41438 See merge request gitlab-org/gitlab-ce!16720
\| * \| \| \| \| \| \| \| \|	fix documentation about node version	Tobias Gurtzick	2018-01-25	3	-8/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolves #41438
* \| \| \| \| \| \| \| \| \|	Merge branch 'feature/migrate-repo-restorer-to-gitaly' into 'master'	Robert Speicher	2018-01-25	9	-11/+80
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate restoring repo from bundle to Gitaly Closes gitaly#946 See merge request gitlab-org/gitlab-ce!16623
\| * \| \| \| \| \| \| \| \| \|	Migrate restoring repo from bundle to Gitalyfeature/migrate-repo-restorer-to-gitaly	Ahmad Sherif	2018-01-24	9	-11/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#946
* \| \| \| \| \| \| \| \| \| \|	Merge branch '34952-only-tags-is-not-taken-in-account-in-the-cache-gems-job' ↵	Robert Speicher	2018-01-25	1	-2/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "`only: - tags` is not taken in account in the `cache gems` job" Closes #34952 See merge request gitlab-org/gitlab-ce!16721
\| * \| \| \| \| \| \| \| \| \| \|	Ensure the job also run for tags	Rémy Coutable	2018-01-25	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'move-users-spinach-tests-to-rspec' into 'master'	Robert Speicher	2018-01-25	3	-124/+107
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move user page spinach tests to RSpec See merge request gitlab-org/gitlab-ce!16598
\| * \| \| \| \| \| \| \| \| \| \|	Move user page spinach tests to RSpec	Semyon Pupkov	2018-01-25	3	-124/+107
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036