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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Improve support for external issue referencesadam-external-issue-references-spike	Adam Niedzielski	2017-06-30	22	-118/+87
\|
*	Merge branch '34461-top-banner-job-master' into 'master'	Phil Hughes	2017-06-30	1	-5/+5
\|\ \| \| \| \| \| \| \| \|	Only verifies top position after the request has finished to account for errors See merge request !12559
\| *	Only verifies top position after the request has finished to account for errors	Filipa Lacerda	2017-06-30	1	-5/+5
\|/
*	Merge branch 'dz-improve-codeclimate-json-cleanup' into 'master'	Kamil Trzciński	2017-06-30	1	-2/+3
\|\ \| \| \| \| \| \| \| \|	Cleanup codeclimate.json file generated by CI See merge request !12565
\| *	Fix codeclimate job in .gitlab-ci.yml	Dmitriy Zaporozhets	2017-06-29	1	-1/+1
\| \|
\| *	Cleanup codeclimate.json file generated by CI	Dmitriy Zaporozhets	2017-06-29	1	-2/+3
\| \|
* \|	Merge branch 'dm-empty-state-new-merge-request' into 'master'	Sean McGivern	2017-06-30	2	-3/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix 'New merge request' button for users who don't have push access to canonical project See merge request !12560
\| * \|	Fix 'New merge request' button for users who don't have push access to ↵dm-empty-state-new-merge-request	Douwe Maan	2017-06-29	2	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \|	canonical project
* \| \|	Merge branch ↵	Dmitriy Zaporozhets	2017-06-30	8	-33/+47
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'34502-gitlab-git-hook-should-set-the-gl_repository-environment-variable' into 'master' Set the GL_REPOSITORY env variable on Gitlab::Git::Hook Closes #34502 See merge request !12572
\| * \| \|	Set the GL_REPOSITORY env variable on Gitlab::Git::Hook34502-gitlab-git-hook-should-set-the-gl_repository-environment-variable	Alejandro Rodríguez	2017-06-29	8	-33/+47
\| \| \| \|
* \| \| \|	Merge branch 'update_issues_board_doc' into 'master'	Achilleas Pipinellis	2017-06-30	4	-0/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	updated version of issues baord images (doc) See merge request !12558
\| * \| \| \|	updated version of issues baord images (doc)	Diego de Souza Mendes	2017-06-29	4	-0/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'inject-add-diff-note' into 'master'	Phil Hughes	2017-06-30	12	-154/+105
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render add-diff-note with server and optimize styles See merge request !12103
\| * \| \| \| \|	Render add-diff-note button with server.	Bryce Johnson	2017-06-29	12	-154/+105
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit moves the rendering of the button back to the server, and shows/hides it using opacity rather than display. It also removes the transform applied to the button on hover (scale). Previously, both of these factors automatically triggered a reflow, which creates a performance bottleneck on pages with larger DOM size. MR: !12103
* \| \| \| \|	Merge branch 'fix-sidebar-showing-mobile-merge-requests' into 'master'	Tim Zallmann	2017-06-30	5	-15/+46
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed sidebar not collapsing on merge request in mobile screens Closes #32759 See merge request !12489
\| * \| \| \| \|	Refactored tests and added a breakpoint to the merge_request_tabsfix-sidebar-showing-mobile-merge-requests	Jose Ivan Vargas	2017-06-29	4	-17/+42
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed sidebar not collapsing on merge request in mobile screens	Jose Ivan Vargas	2017-06-27	3	-3/+9
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'backport-license-issue-weights' into 'master'	Douwe Maan	2017-06-29	2	-5/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport changes to Projects::IssuesController and the search bar See merge request !12551
\| * \| \| \| \| \|	Backport changes to Projects::IssuesController and the search bar	Nick Thomas	2017-06-29	2	-5/+19
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'bugfix/declarative-policy-reloading' into 'master'	Douwe Maan	2017-06-29	3	-3/+3
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bugfix: use `require_dependency` to bring in DeclarativePolicy Closes #34532 See merge request !12571
\| * \| \| \| \| \|	bugfix: use `require_dependency` to bring in DeclarativePolicybugfix/declarative-policy-reloading	http://jneen.net/	2017-06-29	3	-3/+3
\|/ / / / / /
* \| \| \| \| \|	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.