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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/master' into ↵add-ci_variables-environment_scope	Lin Jen-Shin	2017-07-04	194	-1086/+2900
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add-ci_variables-environment_scope * upstream/master: (79 commits) Reset @full_path to nil when cache expires add margin between captcha and register button Eagerly create a milestone that is used in a feature spec Adjust readme repo width Resolve "Issue Board -> "Remove from board" button when viewing an issue gives js error and fails" Fix rubocop offenses Make entrypoint and command keys to be array of strings Add issuable-list class to shared mr/issue lists to fix new responsive layout New navigation breadcrumbs Restore timeago translations in renderTimeago. Fix curl example paths (missing the 'files' segment) Automatically hide sidebar on smaller screens Fix typo in IssuesFinder comment Remove placeholder note when award emoji slash command is applied Make setSidebarHeight more efficient with SidebarHeightManager. Update CHANGELOG.md for 9.3.3 Resolve "More actions dropdown hidden by end of diff" Use Gitaly 0.14.0 Improve support for external issue references Make issuables_count_for_state public ...
\| *	Merge branch 'fix-2801' into 'master'	Sean McGivern	2017-07-03	7	-2/+37
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expires full_path cache after a repository is renamed/transferred Closes gitlab-ee#2801 See merge request !12575
\| \| *	Reset @full_path to nil when cache expires	Douglas Barbosa Alexandre	2017-07-03	2	-3/+5
\| \| \|
\| \| *	Add CHANGELOGfix-2801	Douglas Barbosa Alexandre	2017-06-29	1	-0/+4
\| \| \|
\| \| *	Expires full_path cache after repository is transferred	Douglas Barbosa Alexandre	2017-06-29	2	-0/+7
\| \| \|
\| \| *	Expires full_path cache after project is renamed	Douglas Barbosa Alexandre	2017-06-29	4	-2/+24
\| \| \|
\| * \|	Merge branch '29000-recaptcha-margin' into 'master'	Filipa Lacerda	2017-07-03	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add margin between captcha and register button Closes #29000 See merge request !12607
\| \| * \|	add margin between captcha and register button29000-recaptcha-margin	Simon Knox	2017-07-03	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'patch-24' into 'master'	Rémy Coutable	2017-07-03	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed typo in gitlab_flow.md See merge request !12561
\| \| * \| \|	Fixed typo in gitlab_flow.md	leungpeng	2017-06-29	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch '23036-replace-dashboard-new-project-spinach' into 'master'	Rémy Coutable	2017-07-03	6	-128/+85
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaces 'dashboard/new-project.feature' spinach with rspec See merge request !12550
\| \| * \| \| \|	Replaces 'dashboard/new-project.feature' spinach with rspec	Alexander Randa	2017-06-29	6	-128/+85
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch '34609-fix-lazy-create-milestone-in-spec' into 'master'	Sean McGivern	2017-07-03	1	-6/+6
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eagerly create a milestone that is used in a feature spec Closes #34609 See merge request !12604
\| \| * \| \| \| \|	Eagerly create a milestone that is used in a feature spec	Rémy Coutable	2017-07-03	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Merge branch 'docs-fix-branch-api-examples' into 'master'	Rémy Coutable	2017-07-03	1	-3/+3
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix curl example paths (missing the 'files' segment) See merge request !12588
\| \| * \| \| \| \| \|	Fix curl example paths (missing the 'files' segment)	Joe Marty	2017-06-30	1	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch '34116-milestone-filtering-on-group-issues' into 'master'	Sean McGivern	2017-07-03	5	-0/+60
\| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use correct milestones for filtering on Group Issues Closes #34116 See merge request !12374
\| \| * \| \| \| \| \|	Change milestone endpoint for groups	Takuya Noguchi	2017-06-27	2	-0/+6
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add JSON support to group milestones	Takuya Noguchi	2017-06-27	1	-0/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add tests for Groups::MilestonesController#index	Takuya Noguchi	2017-06-26	1	-0/+15
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add tests for MilestonesHelper#milestones_filter_dropdown_path	Takuya Noguchi	2017-06-26	1	-0/+36
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'dz-improve-codeclimate-json-cleanup' into 'master'	Kamil Trzciński	2017-07-03	1	-2/+0
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary pull command from codeclimate job See merge request !12583
\| \| * \| \| \| \| \| \|	Remove unnecessary pull command from codeclimate jobdz-improve-codeclimate-json-cleanup	Dmitriy Zaporozhets	2017-06-30	1	-2/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'adjust-readme-repo-width' into 'master'	Phil Hughes	2017-07-03	4	-6/+11
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjust readme repo width See merge request !12585
\| \| * \| \| \| \| \| \| \|	Adjust readme repo width	Dimitrie Hoekstra	2017-07-03	4	-6/+11
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch '34525-backport-update-go-to-91-92-guide' into 'master'	Sean McGivern	2017-07-03	2	-16/+34
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make clear that Go 1.8 is required since GitLab 9.2 Closes #34525 See merge request !12564
\| \| * \| \| \| \| \| \| \|	Make clear that Go 1.8 is required since GitLab 9.234525-backport-update-go-to-91-92-guide	Rémy Coutable	2017-06-29	2	-16/+34
\| \| \| \|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Merge branch 'fix-performance_bar-specs' into 'master'	Sean McGivern	2017-07-03	1	-3/+3
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix performance bar specs See merge request !12225
\| \| * \| \| \| \| \| \| \|	Fix the performance bar spec that was not asserting the right thingfix-performance_bar-specs	Rémy Coutable	2017-06-29	1	-3/+3
\| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Merge branch ↵	Phil Hughes	2017-07-03	5	-4/+27
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'34097-issue-board-remove-from-board-button-when-viewing-an-issue-gives-js-error-and-fails' into 'master' Resolve "Issue Board -> "Remove from board" button when viewing an issue gives js error and fails" Closes #34097 See merge request !12430
\| \| * \| \| \| \| \| \|	Resolve "Issue Board -> "Remove from board" button when viewing an issue ↵	Luke "Jared" Bennett	2017-07-03	5	-4/+27
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gives js error and fails"
\| * \| \| \| \| \| \|	Merge branch 'set-sidebar-height' into 'master'	Tim Zallmann	2017-07-02	3	-46/+38
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make issuable sidebar setSidebarHeight more efficient See merge request !12252
\| \| * \| \| \| \| \| \|	Make setSidebarHeight more efficient with SidebarHeightManager.set-sidebar-height	Bryce Johnson	2017-06-30	3	-46/+38
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'change-extended-docker-configuration-syntax' into 'master'	Grzegorz Bizon	2017-07-02	5	-16/+25
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make entrypoint and command keys to be array of strings See merge request !12536
\| \| * \| \| \| \| \| \| \|	Fix rubocop offenseschange-extended-docker-configuration-syntax	Tomasz Maczukin	2017-07-02	3	-6/+6
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Make entrypoint and command keys to be array of strings	Tomasz Maczukin	2017-07-02	5	-16/+25
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'enable-webpack-code-splitting' into 'master'	Jacob Schatz	2017-06-30	15	-69/+137
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable webpack code splitting Closes #32989 See merge request !12032
\| \| * \| \| \| \| \| \| \| \|	add CHANGELOG.md entry for !12032	Mike Greiling	2017-06-29	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	configure webpack publicPath dynamically to account for CDN or relative path ↵	Mike Greiling	2017-06-28	3	-15/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	settings
\| \| * \| \| \| \| \| \| \| \|	move webpack publicPath setup earlier in the bootstrap processes to avoid ES ↵	Mike Greiling	2017-06-28	4	-10/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	module execution order issues
\| \| * \| \| \| \| \| \| \| \|	dynamically import emoji helpers for gl-emoji custom tag prototype	Mike Greiling	2017-06-28	1	-5/+12
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	dynamically import emoji helpers for GfmAutoComplete class	Mike Greiling	2017-06-28	1	-6/+12
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	dynamically import emoji helpers for AwardsHandler class	Mike Greiling	2017-06-28	4	-47/+61
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	dynamically set webpack publicPath when relative_url_root enabled	Mike Greiling	2017-06-28	2	-1/+8
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	ensure eslint recognizes es2015 dynamic import() syntax	Mike Greiling	2017-06-28	3	-1/+16
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'fix-assigned-issuable-lists' into 'master'	Annabel Dunstone Gray	2017-06-30	3	-2/+7
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add issuable-list class to shared mr/issue lists to fix new responsive layout See merge request !12591
\| \| * \| \| \| \| \| \| \| \|	Add issuable-list class to shared mr/issue lists to fix new responsive layoutfix-assigned-issuable-lists	tauriedavis	2017-06-30	3	-2/+7
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'winh-issue-show-aftereach' into 'master'	Clement Ho	2017-06-30	1	-3/+0
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove empty afterEach() from issue_show app_spec.js See merge request !12577
\| \| * \| \| \| \| \| \| \| \| \|	Remove empty afterEach() from issue_show app_spec.jswinh-issue-show-aftereach	Winnie Hellmann	2017-06-29	1	-3/+0
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'restore-timeago-translation' into 'master'	Phil Hughes	2017-06-30	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restore timeago translations in renderTimeago. See merge request !12590