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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Only verifies top position after the request has finished to account for errors	Filipa Lacerda	2017-06-30	1	-5/+5
\|
*	Merge branch 'dm-empty-state-new-merge-request' into 'master'	Sean McGivern	2017-06-30	1	-3/+5
\|\ \| \| \| \| \| \| \| \|	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	1	-3/+5
\| \| \| \| \| \| \| \|	canonical project
* \|	Merge branch ↵	Dmitriy Zaporozhets	2017-06-30	2	-4/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	2	-4/+4
\| \| \|
* \| \|	Merge branch 'inject-add-diff-note' into 'master'	Phil Hughes	2017-06-30	10	-152/+103
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	10	-152/+103
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+3
\| \| \| \| \|
\| * \| \| \|	Fixed sidebar not collapsing on merge request in mobile screens	Jose Ivan Vargas	2017-06-27	1	-1/+0
\| \| \| \| \|
* \| \| \| \|	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
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	bugfix: use `require_dependency` to bring in DeclarativePolicybugfix/declarative-policy-reloading	http://jneen.net/	2017-06-29	2	-2/+2
\| \|_\|/ / \|/\| \| \|
* \| \| \|	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	2	-2/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \| \|	Clean up issuable lists	Taurie Davis	2017-06-29	5	-72/+139
\| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '34078-allow-to-enable-feature-flags-with-more-granularity' ↵	Robert Speicher	2017-06-29	2	-0/+8
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Allow the feature flags to be enabled/disabled with more granularity Closes #34078 See merge request !12357
\| * \| \| \| \| \|	Rename FLippable to FeatureGate and make `flipper_group` and `user` mutually ↵	Rémy Coutable	2017-06-27	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
* \| \| \| \| \| \|	Resolve "Issue dropdown persists when adding issue number to issue description"	Tim Zallmann	2017-06-29	3	-1/+18
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sha-attributes-for-postgresql-and-mysql' into 'master'	Sean McGivern	2017-06-29	1	-0/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added code for defining SHA attributes See merge request !12555
\| * \| \| \| \| \| \|	Added code for defining SHA attributes	Yorick Peterse	2017-06-29	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-3/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project search
* \| \| \| \| \| \| \| \|	Merge branch 'revert-12499' into 'master'	Douwe Maan	2017-06-29	3	-27/+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	3	-27/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit b07c00032b038f40796a28e34b6dd4c622bad012, reversing changes made to 2b97d76d0b08a778710410df910a7601f6b8e9e7.
* \| \| \| \| \| \| \| \|	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	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 '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	1	-1/+10
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	search list
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'hb-fix-abuse-report-on-stale-user-profile' into 'master'	Douwe Maan	2017-06-29	1	-1/+13
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+13
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'refactor/declarative-policy' into 'master'	Sean McGivern	2017-06-29	27	-691/+634
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor/declarative policy See merge request !10515
\| * \| \| \| \| \| \| \| \| \| \| \|	convert the special-case Ability methods to use policies	http://jneen.net/	2017-06-27	1	-34/+10
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	convert all the policies to DeclarativePolicy	http://jneen.net/	2017-06-27	27	-657/+624
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2017-06-29	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'33082-use-update_pipeline_schedule-for-edit-and-take_ownership-in-pipelineschedulescontroller' into 'master' Use authorize_update_pipeline_schedule in PipelineSchedulesController Closes #33082 See merge request !11846
\| * \| \| \| \| \| \| \| \| \| \| \|	Use authorize_update_pipeline_schedule in PipelineSchedulesController	Shinya Maeda	2017-06-28	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'highest-return-on-diff-investment' into 'master'	Sean McGivern	2017-06-29	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bring back branches badge to main project page Closes #34438 See merge request !12548