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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵an-rename-gitaly-services	Andrew Newdigate	2017-07-17	137	-1088/+1546
\|\ \| \| \| \| \| \|	an-rename-gitaly-services
\| *	Merge branch ↵	Sean McGivern	2017-07-17	1	-1/+8
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'34940-peek-performance-bar-doesn-t-count-cached-queries-but-shows-them' into 'master' Resolve "Peek performance bar doesn't count cached queries, but shows them" Closes #34940 See merge request !12915
\| \| *	Don't track cached queries in Gitlab::PerformanceBar::PeekQueryTracker34940-peek-performance-bar-doesn-t-count-cached-queries-but-shows-them	Rémy Coutable	2017-07-17	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Merge branch '31571-don-t-let-webhooks-jobs-go-to-the-dead-jobs-queue' into ↵	Rémy Coutable	2017-07-17	3	-1/+8
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Don't let webhooks jobs go to the dead jobs queue" Closes #31571 See merge request !12918
\| \| * \|	Skip dead jobs queue for web hooks and project services31571-don-t-let-webhooks-jobs-go-to-the-dead-jobs-queue	Sean McGivern	2017-07-17	3	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These jobs may legitimately fail because the endpoint just isn't there any more. We don't want them cluttering up the Sidekiq morgue in that case - it's currently full on GitLab.com.
\| * \| \|	Merge branch 'group-sub-settings-new-sidebar' into 'master'	Annabel Dunstone Gray	2017-07-17	1	-1/+16
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added sub-nav to new group sidebar settings Closes #35140 See merge request !12907
\| \| * \| \|	Added sub-nav to new group sidebargroup-sub-settings-new-sidebar	Phil Hughes	2017-07-17	1	-1/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #35140
\| * \| \| \|	Merge branch 'project-sidebar-members' into 'master'	Annabel Dunstone Gray	2017-07-17	1	-3/+3
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed project members link not staying active Closes gitlab-ee#2942 See merge request !12882
\| \| * \| \|	Fixed project members link not staying activeproject-sidebar-members	Phil Hughes	2017-07-14	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Merge branch 'ee-2950-fix-namespace-visibility-level-helpers' into 'master'	Sean McGivern	2017-07-17	3	-5/+13
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Promote visibility level helpers from Group to Namespace Closes gitlab-ee#2950 See merge request !12910
\| \| * \| \|	Promote visibility level helpers from Group to Namespace	Nick Thomas	2017-07-17	3	-5/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In EE, we make use of `namespace#public?` in projects. When the project is in a personal namespace, this breaks as the `public?` helper isn't present.
\| * \| \| \|	Merge branch '35164-cycle-analytics-firefox' into 'master'	Phil Hughes	2017-07-17	2	-2/+6
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	move click handler to button. when on the icon it wasn't triggered in firefox Closes #35164 See merge request !12905
\| \| * \| \| \|	move click handler to button. when on the icon it wasn't triggered in firefox35164-cycle-analytics-firefox	Simon Knox	2017-07-17	2	-2/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'fix/gb/process-scheduled-background-migrations' into 'master'	Yorick Peterse	2017-07-17	3	-30/+129
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Process scheduled background migrations as well Closes #34951 See merge request !12787
\| \| * \| \| \| \|	Simplify background migrations stealing code	Grzegorz Bizon	2017-07-17	2	-74/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simply re-raise an exception when it occurs, but guarantee that no background migration is lost in the process.
\| \| * \| \| \| \|	Fix off-by-one error in background migration retriesfix/gb/process-scheduled-background-migrations	Grzegorz Bizon	2017-07-17	2	-14/+25
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Recover from all exceptions when stealing bg migration	Grzegorz Bizon	2017-07-17	2	-23/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It also makes it possible to gracefully retry a migration in order to avoid problems like deadlocks.
\| \| * \| \| \| \|	Catch exceptions when stealing background migrations	Grzegorz Bizon	2017-07-14	2	-19/+49
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Avoid race condition when stealing a background migration	Grzegorz Bizon	2017-07-14	2	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We first pop a job from the Sidekiq queue / scheduled set and only if this has been successfully deleted we process the job. This makes it possible to minimize a possibility of a race condition happening.
\| \| * \| \| \| \|	Fix mocks in background migrations specs	Grzegorz Bizon	2017-07-13	2	-2/+5
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add more specs for background migrations queue processing	Grzegorz Bizon	2017-07-13	1	-1/+18
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Implement draining scheduled sets of background migrations	Grzegorz Bizon	2017-07-13	3	-7/+30
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Extract background migratons queue class method	Grzegorz Bizon	2017-07-11	2	-21/+29
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'fix-performance-bar-cached-user-ids' into 'master'	Sean McGivern	2017-07-17	1	-2/+3
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expire cached user IDs that can see the performance after 5 minutes See merge request !12911
\| \| * \| \| \| \| \|	Expire cached user IDs that can see the performance after 5 minutes	Rémy Coutable	2017-07-17	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If we don't expire the cached user IDs, the list of IDs would become outdated when a new member is added, or when a member ios removed from the allowed group. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	Merge branch 'rubocop-hash-index' into 'master'	Rémy Coutable	2017-07-17	3	-0/+105
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added cop to blacklist the use of hash indexes See merge request !12869
\| \| * \| \| \| \| \|	Added cop to blacklist the use of hash indexesrubocop-hash-index	Yorick Peterse	2017-07-14	3	-0/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These indexes are not recorded in the WAL (at least until PostgreSQL 10) and this isn't worth the minor performance improvement over btree indexes.
\| * \| \| \| \| \| \|	Merge branch 'remove-git-search-files' into 'master'	Sean McGivern	2017-07-17	2	-125/+0
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Repository#search_files See merge request !12879
\| \| * \| \| \| \| \| \|	Remove Repository#search_filesremove-git-search-files	Jacob Vosmaer	2017-07-14	2	-125/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch '35181-cannot-create-label-from-board-page' into 'master'	Phil Hughes	2017-07-17	3	-2/+7
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix label creation from new list for subgroup projects Closes #35181 See merge request !12906
\| \| * \| \| \| \| \| \| \|	Fix label creation from new list for subgroup projects	Mark Fletcher	2017-07-17	3	-2/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'gitaly-more-annotations' into 'master'	Sean McGivern	2017-07-17	7	-139/+67
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Branch and tag refactors for Gitaly See merge request !12872
\| \| * \| \| \| \| \| \| \| \|	Gitaly migration annotations	Jacob Vosmaer	2017-07-14	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Use helper instead of ad-hoc regex	Jacob Vosmaer	2017-07-14	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Make commit lookups explicit	Jacob Vosmaer	2017-07-14	6	-87/+45
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Remove deprecated #heads method	Jacob Vosmaer	2017-07-14	2	-40/+2
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Make branch filter support private	Jacob Vosmaer	2017-07-14	1	-11/+16
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2017-07-17	3	-9/+13
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'35155-upgrade-fog-core-to-1-44-3-and-its-providers-to-the-latest' into 'master' Bump fog-core to 1.44.3 and fog providers' plugins to latest Closes #35155 See merge request !12897
\| \| * \| \| \| \| \| \| \| \| \|	Bump fog-core to 1.44.3 and fog providers' plugins to latest	Takuya Noguchi	2017-07-16	3	-9/+13
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch '34964-have_gitlab_http_status' into 'master'	Rémy Coutable	2017-07-17	2	-2/+16
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce have_gitlab_http_status Closes #34964 See merge request !12883
\| \| * \| \| \| \| \| \| \| \| \|	Introduce have_gitlab_http_status34964-have_gitlab_http_status	Lin Jen-Shin	2017-07-15	2	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So that whenever this failed: expect(response).to have_gitlab_http_status(200) We see what's the response there. Here's an example: ``` 1) API::Settings Settings PUT /application/settings custom repository storage type set in the config updates application settings Failure/Error: expect(response).to have_gitlab_http_status(200) expected the response to have status code 200 but it was 400. The response was: {"error":"password_authentication_enabled, signin_enabled are mutually exclusive"} ```
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch '35064-fix-px-difference' into 'master'	Phil Hughes	2017-07-17	1	-1/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce padding on context header Closes #35064 See merge request !12855
\| \| * \| \| \| \| \| \| \| \| \|	Fix line height of breadcrumbs to match context nav header35064-fix-px-difference	Annabel Dunstone Gray	2017-07-13	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'context-nav-avatar-bg' into 'master'	Phil Hughes	2017-07-17	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add white background to context header avatar See merge request !12857
\| \| * \| \| \| \| \| \| \| \| \|	Add white background to context header avatarcontext-nav-avatar-bg	Annabel Dunstone Gray	2017-07-13	1	-0/+1
\| \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Merge branch '35174-fix-aws-elb-query' into 'master'	Tim Zallmann	2017-07-17	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix incorrect AWS ELB metrics. Closes #35174 See merge request !12902
\| \| * \| \| \| \| \| \| \| \|	Fix incorrect AWS ELB metrics.35174-fix-aws-elb-query	Joshua Lambert	2017-07-17	1	-1/+1
\| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Merge branch 'google-launcher' into 'master'	Robert Speicher	2017-07-16	1	-4/+4
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Google launcher details [ci skip] See merge request !12899
\| \| * \| \| \| \| \| \| \| \|	Update Google launcher detailsgoogle-launcher	eliran.mesika	2017-07-16	1	-4/+4
\| \| \| \|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'docs/fix-link-styleguide' into 'master'	Marcia Ramos	2017-07-16	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wrong link to docs in docs styleguide See merge request !12901