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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '34349-select-branch-dropdown-is-too-close-to-branch-name' into ↵34532-hot-code-reloading-in-development-is-broken-by-new-declarative-policies	Annabel Dunstone Gray	2017-06-29	2	-18/+25
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Select branch dropdown is too close to branch name" Closes #34349 See merge request !12515
\| *	Resolve "Select branch dropdown is too close to branch name"	Tim Zallmann	2017-06-29	2	-18/+25
\|/
*	Merge branch 'rs-silence-update-pages-service' into 'master'	Rémy Coutable	2017-06-29	1	-1/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Perform unzip quietly in UpdatePagesService Closes gitlab-ee#225 See merge request !12539
\| *	Perform unzip quietly in UpdatePagesServicers-silence-update-pages-service	Robert Speicher	2017-06-28	1	-1/+2
\| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/225
* \|	Merge branch 'new-nav-logo-safari-fix' into 'master'	Annabel Dunstone Gray	2017-06-29	1	-3/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fixed new navgiation bar logo height in Safari See merge request !12563
\| * \|	Fixed new navgiation bar logo height in Safari	Phil Hughes	2017-06-29	1	-3/+2
\| \| \|
* \| \|	Merge branch '34407-flickering-scroll-v1' into 'master'	Annabel Dunstone Gray	2017-06-29	1	-3/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix scroll flicker Closes #34407 See merge request !12501
\| * \| \|	Fix scroll flicker34407-flickering-scroll-v1	Eric Eastwood	2017-06-28	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/34407 - Revert https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12399 - Update https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12299 throttle/debounce to happen immediately and cleanup
* \| \| \|	Merge branch 'sh-fix-project-destroy-in-namespace' into 'master'	Robert Speicher	2017-06-29	5	-22/+54
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Defer project destroys within a namespace in Groups::DestroyService#async_execute See merge request !12435
\| * \| \| \|	Defer project destroys within a namespace in ↵	Stan Hu	2017-06-29	5	-22/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Groups::DestroyService#async_execute Group#destroy would actually hard-delete all associated projects even though the acts_as_paranoia gem is used, preventing Projects::DestroyService from doing any work. We first noticed this while trying to log all projects deletion to the Geo log.
* \| \| \| \|	Merge branch 'issueable-list-cleanup' into 'master'	Annabel Dunstone Gray	2017-06-29	8	-74/+145
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up issuable lists Closes #26818 See merge request !11991
\| * \| \| \| \|	Clean up issuable lists	Taurie Davis	2017-06-29	8	-74/+145
\|/ / / / /
* \| \| \| \|	Merge branch '33443_supplement_traditional_chinese_in_taiwan_translation' ↵	Douwe Maan	2017-06-29	2	-86/+883
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Supplement Traditional Chinese in Taiwan translation of Project Page & Repository Page Closes #33443 See merge request !12514
\| * \ \ \ \	rebase to master	黄涛	2017-06-29	0	-0/+0
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '33443_supplement_traditional_chinese_in_taiwan_translation' of gitlab.com:htve/gitlab-ce into 33443_supplement_traditional_chinese_in_taiwan_translation
\| \| * \| \| \| \|	optimize translation content based on comments	黄涛	2017-06-29	1	-20/+20
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	supplement traditional chinese in taiwan translation	黄涛	2017-06-28	2	-86/+883
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #33443
\| * \| \| \| \| \|	optimize translation content based on comments	黄涛	2017-06-29	1	-20/+20
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	supplement traditional chinese in taiwan translation	黄涛	2017-06-29	2	-86/+883
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #33443
* \| \| \| \| \| \|	Merge branch '34078-allow-to-enable-feature-flags-with-more-granularity' ↵	Robert Speicher	2017-06-29	8	-33/+241
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Allow the feature flags to be enabled/disabled with more granularity Closes #34078 See merge request !12357
\| * \| \| \| \| \|	Rename flipper_group to feature_group34078-allow-to-enable-feature-flags-with-more-granularity	Rémy Coutable	2017-06-28	3	-12/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Add MR iid in CHANGELOG entry	Rémy Coutable	2017-06-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Rename FLippable to FeatureGate and make `flipper_group` and `user` mutually ↵	Rémy Coutable	2017-06-27	6	-16/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	exclusive Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Allow the feature flags to be enabled/disabled with more granularity	Rémy Coutable	2017-06-27	8	-33/+233
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows to enable/disable a feature flag for a given user, or a given Flipper group (must be declared statically in the `flipper.rb` initializer beforehand). Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch ↵	Phil Hughes	2017-06-29	4	-1/+22
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'34403-issue-dropdown-persists-when-adding-issue-number-to-issue-description' into 'master' Resolve "Issue dropdown persists when adding issue number to issue description" Closes #34403 See merge request !12521
\| * \| \| \| \| \| \|	Resolve "Issue dropdown persists when adding issue number to issue description"	Tim Zallmann	2017-06-29	4	-1/+22
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'jej/run-mysql-tests-on-stable-preparation-branches' into 'master'	Rémy Coutable	2017-06-29	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Run mysql tests on stable preperation branches like 9-3-stable-patch-2 See merge request !12552
\| * \| \| \| \| \| \|	Run mysql tests on stable preperation branches like 9-3-stable-patch-2jej/run-mysql-tests-on-stable-preparation-branches	James Edwards-Jones	2017-06-29	1	-1/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sha-attributes-for-postgresql-and-mysql' into 'master'	Sean McGivern	2017-06-29	6	-0/+149
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added code for defining SHA attributes See merge request !12555
\| * \| \| \| \| \| \|	Added code for defining SHA attributes	Yorick Peterse	2017-06-29	6	-0/+149
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These attributes are stored in binary in the database, but exposed as strings. This allows one to query/create data using plain SHA1 hashes as Strings, while storing them more efficiently as binary.
* \| \| \| \| \| \| \|	Merge branch 'refactor-namespace-default-scope-override' into 'master'	Douwe Maan	2017-06-29	2	-3/+11
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Namespace model default scope override and write additional test to Project search See merge request !12546
\| * \| \| \| \| \| \| \|	Remove Namespace model default scope override and write additional test to ↵refactor-namespace-default-scope-override	Tiago Botelho	2017-06-29	2	-3/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project search
* \| \| \| \| \| \| \| \|	Merge branch 'revert-12499' into 'master'	Douwe Maan	2017-06-29	5	-52/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'" Closes #34511 See merge request !12557
\| * \| \| \| \| \| \| \| \|	Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'"	Adam Niedzielski	2017-06-29	5	-52/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit b07c00032b038f40796a28e34b6dd4c622bad012, reversing changes made to 2b97d76d0b08a778710410df910a7601f6b8e9e7.
* \| \| \| \| \| \| \| \| \|	Merge branch '33961-blank-section' into 'master'	Phil Hughes	2017-06-29	1	-1/+12
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move verification to block level instead of paragraph Closes #33961 See merge request !12519
\| * \| \| \| \| \| \| \| \| \|	Move verification to block level instead of paragraph	Filipa Lacerda	2017-06-29	1	-1/+12
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'zj-usage-ping-only-gl-pipelines' into 'master'	Kamil Trzciński	2017-06-29	5	-2/+19
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only count GL pipelines in usage data ping Closes #33172 See merge request !12277
\| * \| \| \| \| \| \| \| \| \|	Split pipelines by origin on usage datazj-usage-ping-only-gl-pipelines	Z.J. van de Weg	2017-06-27	5	-2/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When sending the usage data, it now includes all pipelines. This commit will split the pipelines in two; internal and external. This will lead to historical data being incorrectly marked this way. Fixes gitlab-org/gitlab-ce#33172
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into 'master'	Rémy Coutable	2017-06-29	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update README.md to reflect where "Secret variables" are located See merge request !12540
\| * \| \| \| \| \| \| \| \| \| \|	Update README.md to reflect where "Secret variables" are located	Sean	2017-06-28	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sidebar-header-no-conflicts' into 'master'	Phil Hughes	2017-06-29	5	-1/+48
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sidebar header no conflicts See merge request !12524
\| * \| \| \| \| \| \| \| \| \| \| \|	Minor editssidebar-header-no-conflicts	Annabel Dunstone Gray	2017-06-29	3	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Make header into links; CSS tweaks	Annabel Dunstone Gray	2017-06-28	5	-8/+14
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add context header to sidebar	Annabel Dunstone Gray	2017-06-28	5	-1/+43
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '26125-match-username-on-search' into 'master'	Douwe Maan	2017-06-29	3	-26/+47
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Inserts exact matches of username and email to the top of the user search list Closes #26125 See merge request !12525
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Inserts exact matches of username, email and name to the top of the user ↵26125-match-username-on-search	Tiago Botelho	2017-06-29	3	-26/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	search list
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'hb-fix-abuse-report-on-stale-user-profile' into 'master'	Douwe Maan	2017-06-29	4	-2/+43
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix errors caused by attempts to report already blocked or deleted users Closes #8928 See merge request !12502
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix errors caused by attempts to report already blocked or deleted users	Horacio Bertorello	2017-06-28	4	-2/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'refactor/declarative-policy' into 'master'	Sean McGivern	2017-06-29	52	-971/+2285
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor/declarative policy See merge request !10515
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add some extremely rough documentation	http://jneen.net/	2017-06-27	1	-0/+116
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use subject scope in :id/users	http://jneen.net/	2017-06-27	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	since we're loading all the members anyways