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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Delete users asynchronouslysh-fix-destroy-user-race	Stan Hu	2017-04-02	4	-8/+24
\|
*	Fix race condition where a namespace would be deleted before a project was ↵	Stan Hu	2017-04-02	3	-4/+24
\| \| \| \| \| \| \| \| \| \| \| \| \|	deleted When deleting a user, the following sequence could happen: 1. Project `mygroup/myproject` is scheduled for deletion 2. The group `mygroup` is deleted 3. Sidekiq worker runs to delete `mygroup/myproject`, but the namespace and routes have been destroyed. Closes #30334
*	Merge branch 'sh-fix-capybara-features' into 'master'	Grzegorz Bizon	2017-04-02	2	-2/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix Spinach and Capybara dependencies Closes #30347 See merge request !10395
\| *	Fix Spinach and Capybara dependencies	Stan Hu	2017-04-01	2	-2/+4
\| \| \| \| \| \| \| \|	Closes #30347
* \|	Merge branch '20914-project-home-width' into 'master'	Clement Ho	2017-04-01	3	-4/+8
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	20914 Limits line length for project home page Closes #20914 See merge request !10346
\| *	20914 Limits line length for project home page	tauriedavis	2017-03-30	3	-4/+8
\| \| \| \| \| \| \| \|	fix lint issues
* \|	Merge branch '30236-fix-capybara-timeouts' into 'master'	Douwe Maan	2017-04-01	3	-13/+12
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase Capybara's timeout Closes #30236 See merge request !10337
\| * \|	Properly eagerly-load the Capybara server for JS feature specs only	Rémy Coutable	2017-03-31	3	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Eager-load the Capybara server to prevent timeouts	Rémy Coutable	2017-03-31	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Increase Capybara's timeout	Rémy Coutable	2017-03-31	3	-9/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also disabled assets warming for Capybara/RSpec and remove a check to skip assets warming when ./tmp/cache/assets/test exists because assets are now served by webpack-dev-server. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch ↵	Douwe Maan	2017-03-31	6	-20/+75
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'25556-prevent-users-from-disconnecting-gitlab-account-from-cas' into 'master' Prevent users from disconnecting gitlab account from CAS Closes #25556 See merge request !10282
\| * \| \|	Prevent users from disconnecting gitlab account from CAS	Tiago Botelho	2017-03-31	6	-20/+75
\| \| \| \|
* \| \| \|	Merge branch 'add-download-attr' into 'master'	Alfredo Sumaran	2017-03-31	6	-5/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add download attribute to download links See merge request !10318
\| * \| \| \|	Add download attribute to download links	Clement Ho	2017-03-29	6	-5/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch '30276-move-top-badges' into 'master'	Annabel Dunstone Gray	2017-03-31	2	-9/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	30276 Move issue, mr, todos next to profile dropdown in top nav Closes #30276 See merge request !10347
\| * \| \| \| \|	30276 Move issue, mr, todos next to profile dropdown in top nav	tauriedavis	2017-03-31	2	-9/+13
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'doc-upgrade-8.2-to-8.3' into 'master'	Achilleas Pipinellis	2017-03-31	1	-0/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updating documentation to include a missing step in the update procedure See merge request !10373
\| * \| \| \| \| \|	Updating documentation to include a missing step in the update procedure	Paschalis Korosoglou	2017-03-31	1	-0/+8
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'nav-weird-gap-fix' into 'master'	Annabel Dunstone Gray	2017-03-31	1	-0/+8
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed a gap underneath the scrolling inner page links See merge request !10325
\| * \| \| \| \|	Fixed a gap underneath the scrolling inner page links	Phil Hughes	2017-03-30	1	-0/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '28812-refactor-search-controller-show' into 'master'	Rémy Coutable	2017-03-31	7	-72/+408
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor SearchController#show Closes #28812 See merge request !9655
\| * \| \| \| \| \|	Refactor SearchController#show	Dongqing Hu	2017-03-31	7	-72/+408
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'forked-subquery-order' into 'master'	Yorick Peterse	2017-03-31	2	-2/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary ORDER BY clause from `forked_to_project_id` subquery See merge request !10334
\| * \| \| \| \| \|	Remove unnecessary ORDER BY clause from `forked_to_project_id` subquery	mhasbini	2017-03-30	2	-2/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '29929-jira-doc' into 'master'	Sean McGivern	2017-03-31	2	-1/+5
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix link to Jira service documentation Closes #29929 See merge request !10366
\| * \| \| \| \| \|	Fix link to Jira service documentation	Jarka Kadlecova	2017-03-31	2	-1/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '29341-add-metrics-button-env-overview' into 'master'	Filipa Lacerda	2017-03-31	14	-16/+163
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add metrics button to Environment Overview page Closes #29341 See merge request !10234
\| * \| \| \| \| \| \|	Add metrics button to Environment Overview page	Kushal Pandya	2017-03-31	14	-16/+163
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'docs/ci-dpl-example' into 'master'	Achilleas Pipinellis	2017-03-31	1	-29/+57
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update dpl CI example Closes #3129 See merge request !9872
\| * \| \| \| \| \| \|	Update dpl CI example	Achilleas Pipinellis	2017-03-30	1	-29/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'sh-fix-unnecessary-queries' into 'master'	Rémy Coutable	2017-03-31	1	-0/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate unnecessary queries that add ~500 ms of load time for a large issue See merge request !10365
\| * \| \| \| \| \| \| \|	Eliminate unnecessary queries that add ~500 ms of load time for a large issue	Stan Hu	2017-03-30	1	-0/+3
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Looking at the SQL log, we see useless queries such as: ``` D, [2017-03-22T03:25:00.726710 #2629] DEBUG -- : (235.9ms) SELECT MAX("project_authorizations"."access_level") AS maximum_access_level, "project_authorizations"."user_id" AS project_authorizations_user_id FROM "project_authorizations" WHERE "project_authorizations"."project_id" = 13083 AND 1=0 GROUP BY "project_authorizations"."user_id" [["project_id", 13083]] ```
* \| \| \| \| \| \| \|	Merge branch 'fix_admin_monitoring_background' into 'master'	Sean McGivern	2017-03-31	4	-4/+16
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix issue #30083 handle parsing OpenBSD ps output properly to display sidekiq Closes #30083 See merge request !10303
\| * \| \| \| \| \| \|	Handle parsing OpenBSD ps output properly to display sidekiq	Sebastian Reitenbach	2017-03-31	4	-4/+16
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	infos on admin->monitoring->background
* \| \| \| \| \| \|	Merge branch '24861-stringify-group-member-details' into 'master'	Clement Ho	2017-03-30	2	-2/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide form inputs for group member without editing rights Closes #24861 See merge request !7816
\| * \| \| \| \| \| \|	Remove unnecessary variable	Kushal Pandya	2017-02-28	1	-2/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove author name	Kushal Pandya	2017-02-27	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Changelog entry for issue #24861	Kushal Pandya	2017-02-27	1	-0/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Hide form inputs for user without access	Kushal Pandya	2017-02-27	1	-2/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '30289-allow-users-to-import-github-projects-to-subgroups' into ↵	Robert Speicher	2017-03-30	3	-1/+19
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Allow users to import GitHub projects to subgroups Closes #30289 and #30148 See merge request !10344
\| * \| \| \| \| \| \| \|	Allow users to import GitHub projects to subgroups	Douglas Barbosa Alexandre	2017-03-30	3	-1/+19
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'fix-docs-check-links' into 'master'	Achilleas Pipinellis	2017-03-30	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the docs:check:links job See merge request !10340
\| * \| \| \| \| \| \| \|	Fix the docs:check:links job	Rémy Coutable	2017-03-30	1	-1/+1
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch '30284-fix-repo-clean-rules' into 'master'	Robert Speicher	2017-03-30	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't clean up the gitlab-test-fork_bare repo Closes #30284 See merge request !10342
\| * \| \| \| \| \| \|	Don't clean up the gitlab-test-fork_bare repo	Nick Thomas	2017-03-30	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '29883-retry-button' into 'master'	Annabel Dunstone Gray	2017-03-30	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds container option for tooltip to prevent the button from losing round corners Closes #29883 See merge request !10317
\| * \| \| \| \| \| \|	Adds container option for tooltip to prevent the button from losing round ↵	Filipa Lacerda	2017-03-29	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	corners
* \| \| \| \| \| \| \|	Merge branch 'allow-multiple-paths-in-repository-log' into 'master'	Robert Speicher	2017-03-30	2	-5/+29
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support >1 path in Gitlab::Git::Repository#log See merge request !10291
\| * \| \| \| \| \| \| \|	Support >1 path in Gitlab::Git::Repository#log	Sean McGivern	2017-03-30	2	-5/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is analogous to `git log -- foo bar baz`, but not the same as `Gitlab::Git::Repository#log(path: 'foo bar baz')`, which would run `git log -- 'foo bar baz'`.
* \| \| \| \| \| \| \| \|	Merge branch 'ipython-notebook-viewer-improvements' into 'master'	Jacob Schatz	2017-03-30	2	-2523/+2540
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added worksheets support to notebook viewer See merge request !10307