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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove unnecessary user hash being passed to DeploymentSerializerenforce-current-user-usage-on-entities	Oswaldo Ferreira	2017-05-10	1	-1/+1
\|
*	Ensure all Serializers receive `current_user` instead `user`	Oswaldo Ferreira	2017-05-10	1	-1/+1
\|
*	Merge branch 'remove-old-isobject' into 'master'	Phil Hughes	2017-05-10	11	-47/+18
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Replace old isObject for underscore methods Closes #30317 See merge request !11124
\| *	Replace old isObject for underscore methods	Filipa Lacerda	2017-05-10	11	-47/+18
\|/
*	Merge branch '30286-vue-loadin-icon' into 'master'	Phil Hughes	2017-05-10	20	-105/+187
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Tech debt: Creates vue component for loading icon Closes #31328 See merge request !11167
\| *	Tech debt: Creates vue component for loading icon	Filipa Lacerda	2017-05-10	20	-105/+187
\|/
*	Merge branch '31554-update-rufus-scheduler-and-sidekiq' into 'master'	Rémy Coutable	2017-05-10	5	-9/+34
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Update gem sidekiq-cron from 0.4.4 to 0.6.0 and rufus-scheduler from 3.1.10 to 3.4.0" Closes #31554 See merge request !10976
\| *	Resolve "Update gem sidekiq-cron from 0.4.4 to 0.6.0 and rufus-scheduler ↵	Dosuken shinya	2017-05-10	5	-9/+34
\|/ \| \| \|	from 3.1.10 to 3.4.0"
*	Merge branch '32077-pipeline-graph-margins' into 'master'	Phil Hughes	2017-05-10	1	-5/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken margin in pipeline graph Closes #32077 See merge request !11239
\| *	Fix broken margin in pipeline graph	Filipa Lacerda	2017-05-10	1	-5/+5
\|/
*	Merge branch 'fix-reassigned-mr-email' into 'master'	Douwe Maan	2017-05-10	2	-19/+10
\|\ \| \| \| \| \| \| \| \|	Fix reassigned MR HTML email See merge request !11238
\| *	Fix reassigned MR emailfix-reassigned-mr-email	Sean McGivern	2017-05-10	2	-19/+10
\| \|
* \|	Merge branch 'feature/print-go-version-in-env-info' into 'master'	Sean McGivern	2017-05-10	2	-0/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Print Go version in rake gitlab:env:info See merge request !11241
\| * \|	Print Go version in rake gitlab:env:infofeature/print-go-version-in-env-info	Ahmad Sherif	2017-05-10	2	-0/+7
\| \|/
* \|	Merge branch 'fix-sidebar_spec-assignee-edit-transient-failure' into 'master'	Sean McGivern	2017-05-10	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Find dropdown-menu before asserting active item in sidebar_spec.rb See merge request !11246
\| * \|	Find dropdown-menu before asserting active item in sidebar_spec.rbfix-sidebar_spec-assignee-edit-transient-failure	Luke "Jared" Bennett	2017-05-10	1	-2/+2
\| \| \|
* \| \|	Merge branch 'search-restrict-projects-to-group' into 'master'	Filipa Lacerda	2017-05-10	4	-9/+50
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Filter projects by group on search page Closes #29489 See merge request !11169
\| * \| \|	Filter projects by group on search pagesearch-restrict-projects-to-group	Phil Hughes	2017-05-08	4	-9/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After selecting a group, the projects dropdown will now filter by group projects instead Closes #29489
* \| \| \|	Merge branch 'fix-search-not-highlighting' into 'master'	Filipa Lacerda	2017-05-10	3	-10/+47
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed search terms not highlight Closes #31997 See merge request !11198
\| * \| \| \|	Fixed search terms not highlight	Phil Hughes	2017-05-10	3	-10/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #31997
* \| \| \| \|	Merge branch 'issue-boards-sidebar-create-new-label-404-error' into 'master'	Filipa Lacerda	2017-05-10	3	-1/+50
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed create label form not working on issue boards in a sub-group project Closes #31862 See merge request !11182
\| * \| \| \|	Fixed create label form not working on issue boards in a sub-group projectissue-boards-sidebar-create-new-label-404-error	Phil Hughes	2017-05-08	3	-1/+50
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Closes #31862
* \| \| \|	Merge branch 'use_relative_path_for_project_avatars' into 'master'	Douwe Maan	2017-05-10	17	-44/+107
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use relative paths for group/project/user avatars Closes #13418 and #19662 See merge request !11001
\| * \| \| \|	Use relative paths for group/project/user avatars	blackst0ne	2017-05-10	17	-44/+107
\| \| \| \| \|
* \| \| \| \|	Merge branch 'patch-5' into 'master'	Douwe Maan	2017-05-10	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update tree_helper.rb to fix #31784, which broken file browse where paths deeper than 6:'/'. Closes #31784 See merge request !11197
\| * \| \| \|	update yield to return string path	zzjin	2017-05-10	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Update tree_helper.rb to fix #31784, which broken file browse where paths ↵	zzjin	2017-05-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	deeper than 6:'/'.
* \| \| \| \|	Merge branch '20517-delete-projects-issuescontroller-redirect_old' into ↵	Dmitriy Zaporozhets	2017-05-10	2	-16/+5
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Delete `Projects::IssuesController#redirect_old`" Closes #20517 See merge request !11135
\| * \| \| \|	Remove redirect for old issue url containing id instead of iid	blackst0ne	2017-05-10	2	-16/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch '32074-failed-build' into 'master'	Phil Hughes	2017-05-10	2	-102/+233
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken test - load correct data Closes #32074 See merge request !11237
\| * \| \| \| \|	Fix broken test - load correct data32074-failed-build	Filipa Lacerda	2017-05-10	2	-102/+233
\|/ / / / /
* \| \| \| \|	Merge branch '31349-pipelines-vue' into 'master'	Phil Hughes	2017-05-10	5	-31/+34
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use vue file for table pagination component Closes #31349 See merge request !11210
\| * \| \| \| \|	Use vue file for table pagination component	Filipa Lacerda	2017-05-10	5	-31/+34
\|/ / / / /
* \| \| \| \|	Merge branch 'tc-fix-openid-sign-in-at-again' into 'master'	Robert Speicher	2017-05-10	3	-6/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Spec fix: Add :redis keyword to some specs clear state of trackable attributes Closes #32041 See merge request !11221
\| * \| \| \| \|	Revert "Fix OpenID spec failure that assumed current_sign_in_at would be set"tc-fix-openid-sign-in-at-again	Toon Claes	2017-05-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 73f448e589f46865140412754a9c97df52dc16c7.
\| * \| \| \| \|	Add :redis keyword to some specs clear state of trackable attributes	Toon Claes	2017-05-09	3	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The specs that rely on a correct value of the trackable attributes, should include the `:redis` keyword in the spec to ensure the state is reset between various specs. The trackable attributes being: - sign_in_count : Increased every time a sign in is made (by form, openid, oauth) - current_sign_in_at : A timestamp updated when the user signs in - last_sign_in_at : Holds the timestamp of the previous sign in - current_sign_in_ip : The remote ip updated when the user sign in - last_sign_in_ip : Holds the remote ip of the previous sign in The limiting of writing trackable attributes was introduced in gitlab-org/gitlab-ce!11053.
* \| \| \| \| \|	Merge branch ↵	Clement Ho	2017-05-10	5	-8/+33
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'32030-transient-failure-in-spec-features-boards-boards_spec-rb' into 'master' Fix transient job failures relating to "unhandled Promise rejection" in issue boards Closes #32030 See merge request !11222
\| * \| \| \| \| \|	stub error handlers where uncaught Promise rejections currently exist32030-transient-failure-in-spec-features-boards-boards_spec-rb	Mike Greiling	2017-05-09	5	-8/+33
\| \|/ / / / /
* \| \| \| \| \|	Merge branch '31053-pipeline-ux' into 'master'	Fatih Acet	2017-05-09	5	-4/+114
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds left connector class to the rendered graph Closes #31053 See merge request !11179
\| * \ \ \ \ \	Merge branch 'master' into 31053-pipeline-ux31053-pipeline-ux	Filipa Lacerda	2017-05-09	205	-1562/+7156
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Fallback to default pattern when note does not belong to project Merge request widget redesign Fixed focused test in notes spec Fixed UP arrow key not editing last comment in discussion Fix skipped manual actions issue in pipeline processing Fix notify_only_default_branch check for Slack service
\| * \ \ \ \ \ \	Merge branch 'master' into 31053-pipeline-ux	Filipa Lacerda	2017-05-08	12	-28/+343
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Update guides for 9.2. [skip ci] add documentation Standardize jasmine test describe block names that test specific methods
\| * \| \| \| \| \| \|	Adds left connector class to the rendered graph	Filipa Lacerda	2017-05-08	5	-4/+114
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '32021-job-component-test-failure' into 'master'	Fatih Acet	2017-05-09	1	-28/+46
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix test failure in job vue componenFix test failure in job vue componentt Closes #32021 See merge request !11208
\| * \| \| \| \| \| \|	Fix test failure in job vue componenFix test failure in job vue componentt32021-job-component-test-failure	Filipa Lacerda	2017-05-09	1	-28/+46
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'dm-tree-blob-blame-consistency' into 'master'	Fatih Acet	2017-05-09	16	-69/+82
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make tree, blob and blame pages more consistent See merge request !11194
\| * \| \| \| \| \| \|	Add Repository subnav to 'Find files'dm-tree-blob-blame-consistency	Douwe Maan	2017-05-09	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make tree, blob and blame pages more consistent	Douwe Maan	2017-05-09	15	-69/+81
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'winh-german-cycle-analytics' into 'master'	Douwe Maan	2017-05-09	3	-70/+74
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add German translation for Cycle Analytics See merge request !11161
\| * \| \| \| \| \| \|	Add German translation for Cycle Analytics (!11161)	winh	2017-05-09	3	-70/+74
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'sh-fix-openid-spec-failure' into 'master' bj-blank-state-issues-list-bug	Robert Speicher	2017-05-09	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix OpenID spec failure that assumed current_sign_in_at would be set Closes #32041 See merge request !11219