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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'docs-customizing-autodevops' into 'master'	Evan Read	2018-12-17	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Fix anchor link to customizing AutoDevops yaml file See merge request gitlab-org/gitlab-ce!22962
\| *	Fix anchor link to customizing AutoDevops .yaml filedocs-customizing-autodevops	David Planella	2018-11-11	1	-1/+1
\| \|
* \|	Merge branch 'docs-cycle-analytics-internal-project-correction' into 'master'	Evan Read	2018-12-17	1	-1/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: any authed user can see internal project cycle analytics Closes #55395 See merge request gitlab-org/gitlab-ce!23864
\| * \|	Correction, any authed user can see internal proj	Jeremy Watson	2018-12-17	1	-1/+2
\| \| \|
* \| \|	Merge branch 'reduce-service-params-diff-with-ce' into 'master'	Robert Speicher	2018-12-17	1	-1/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the EE version of ServiceParams See merge request gitlab-org/gitlab-ce!23881
\| * \| \|	Use the EE version of ServiceParams	Rémy Coutable	2018-12-17	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'avoid-wrapped-clone-button' into 'master'	Mike Greiling	2018-12-17	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-align project title row and repo button containers Closes #55287 See merge request gitlab-org/gitlab-ce!23833
\| * \| \| \|	Re-align project title row and repo button containers	Andreas Kämmerle	2018-12-14	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'update_reliable_fetcher' into 'master'	Douglas Barbosa Alexandre	2018-12-17	3	-4/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump gitlab-reliable-fetcher gem See merge request gitlab-org/gitlab-ce!23854
\| * \| \| \| \|	Bump gitlab-reliable-fetcher gem	Valery Sizov	2018-12-17	3	-4/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch ↵	Phil Hughes	2018-12-17	4	-11/+37
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'53954-resolved-non-diff-discussions-on-merge-requests-no-longer-show-who-resolved-them-and-when-at-a-glance' into 'master' Show who resolved non-diff discussions Closes #53954 See merge request gitlab-org/gitlab-ce!23449
\| * \| \| \| \|	Add message saying who resolved nondiff discussion	sbigelow	2018-12-17	4	-11/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add resolution text to notes in MR Discussions - Use slots to do so
* \| \| \| \| \|	Merge branch 'jlenny-CI_COMMIT_SHORT_SHA' into 'master'	Grzegorz Bizon	2018-12-17	4	-0/+12
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add new predefined variable CI_COMMIT_SHORT_SHA Closes #48061 See merge request gitlab-org/gitlab-ce!23822
\| * \| \| \| \|	Add new predefined variable CI_COMMIT_SHORT_SHA	Jason Lenny	2018-12-17	4	-0/+12
\|/ / / / /
* \| \| \| \|	Merge branch 'gt-add-externalized-strings-for-cluster-error-msg' into 'master'	Douglas Barbosa Alexandre	2018-12-17	2	-3/+12
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add externalized strings for clusters error messages Closes #45310 See merge request gitlab-org/gitlab-ce!23753
\| * \| \| \| \|	Add externalized strings for clusters error messages	George Tsiolis	2018-12-17	2	-3/+12
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'fl-update-svg' into 'master'	Phil Hughes	2018-12-17	2	-5/+5
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates gitlab-svg dependency See merge request gitlab-org/gitlab-ce!23871
\| * \| \| \|	Updates gitlab-svg dependency	Filipa Lacerda	2018-12-17	2	-5/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch 'revert-1cccfca1' into 'master'	Grzegorz Bizon	2018-12-17	2	-16/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'auto_devops_kubernetes_active' into 'master'" See merge request gitlab-org/gitlab-ce!23826
\| * \| \| \| \|	Revert "Merge branch 'auto_devops_kubernetes_active' into 'master'"	Thong Kuah	2018-12-17	2	-16/+15
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22929
* \| \| \| \|	Merge branch 'docs-improve-process' into 'master'	Achilleas Pipinellis	2018-12-17	2	-38/+49
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve & clean up the PROCESS.md doc See merge request gitlab-org/gitlab-ce!23769
\| * \| \| \| \|	Improve & clean up the PROCESS.md doc	Rémy Coutable	2018-12-17	2	-38/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch '55230-remove-project-cleanup-feature-flag' into 'master'	Douwe Maan	2018-12-17	6	-73/+63
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the project_cleanup feature flag Closes #55230 See merge request gitlab-org/gitlab-ce!23814
\| * \| \| \| \|	Remove the project_cleanup feature flag	Nick Thomas	2018-12-15	4	-55/+14
\| \| \| \| \| \|
\| * \| \| \| \|	Fix repository cleanup with object storage on	Nick Thomas	2018-12-15	2	-18/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the BFG object map file is in object storage (i.e., uploads in general are placed into object storage), we get an instance of the Gitlab::HttpIO class. This doesn't behave as expected when you try to read past EOF, so we need to explicitly check for this condition to avoid ending up in a tight loop around io.read
* \| \| \| \| \|	Merge branch 'updateDangerfileCommits' into 'master'	Rémy Coutable	2018-12-17	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify messaging on what fails for too many failed lines See merge request gitlab-org/gitlab-ce!23862
\| * \| \| \| \| \|	Clarify messaging on what fails for too many failed lines	Sam Bigelow	2018-12-17	1	-1/+1
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'inline-duplicated-discussions' into 'master'	Fatih Acet	2018-12-17	2	-1/+66
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed duplicated inline diff discussions Closes #55388 See merge request gitlab-org/gitlab-ce!23843
\| * \| \| \| \| \|	Fixed duplicated inline diff discussions	Phil Hughes	2018-12-14	2	-1/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55388
* \| \| \| \| \| \|	Merge branch 'update-page-filter-path-defaults' into 'master'	Rémy Coutable	2018-12-17	8	-28/+23
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change `page_filter_path` to not exclude `label_name` by default See merge request gitlab-org/gitlab-ce!23825
\| * \| \| \| \| \| \|	Change `page_filter_path` default behavior	Heinrich Lee Yu	2018-12-14	8	-28/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`label_name` is now not excluded by default Also removed `label: true` from calls to the helper
* \| \| \| \| \| \| \|	Merge branch 'deprecated-comparing-actioncontroller-params-hash' into 'master'	Rémy Coutable	2018-12-17	6	-10/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix deprecation: Comparing equality between ActionController::Parameters and a Hash is deprecated See merge request gitlab-org/gitlab-ce!23855
\| * \| \| \| \| \| \| \|	Fix deprecation: Comparing equality between ActionController::Parameters and ↵	Jasper Maes	2018-12-16	6	-10/+16
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a Hash is deprecated
* \| \| \| \| \| \| \|	Merge branch 'deprecated-actiondispatch-paramsparser' into 'master'	Rémy Coutable	2018-12-17	2	-1/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated ActionDispatch::ParamsParser See merge request gitlab-org/gitlab-ce!23848
\| * \| \| \| \| \| \| \|	Remove deprecated ActionDispatch::ParamsParser	Jasper Maes	2018-12-16	2	-1/+5
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch ↵	Yorick Peterse	2018-12-17	4	-41/+259
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'55433-un-revert-https-gitlab-com-gitlab-org-gitlab-ce-commit-00acef434031b5dc0bf39576a9e83802c7806842-revert' into 'master' Resolve "Un-revert https://gitlab.com/gitlab-org/gitlab-ce/commit/00acef434031b5dc0bf39576a9e83802c7806842 revert" Closes #55433 See merge request gitlab-org/gitlab-ce!23861
\| * \| \| \| \| \| \| \|	Revert "Revert "LfsToken uses JSONWebToken::HMACToken by default""	Ash McKenzie	2018-12-17	4	-41/+259
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 00acef434031b5dc0bf39576a9e83802c7806842.
* \| \| \| \| \| \| \|	Merge branch 'add-horizontal-whitespace-to-profile-page' into 'master'	Kushal Pandya	2018-12-17	1	-14/+16
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "User profile page: Enhance horizonal whitespace between Overview columns" Closes #55252 See merge request gitlab-org/gitlab-ce!23803
\| * \| \| \| \| \| \|	Enhance horizontal whitespace	Andreas Kämmerle	2018-12-13	1	-14/+16
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'remove-rails4-specific-code' into 'master'	Rémy Coutable	2018-12-17	38	-280/+59
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove rails4 specific code See merge request gitlab-org/gitlab-ce!23847
\| * \| \| \| \| \| \| \|	Remove rails4 specific code	Jasper Maes	2018-12-16	38	-280/+59
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'jramsay/web-terminal' into 'master'	Achilleas Pipinellis	2018-12-17	1	-2/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clearly state web terminal is not supported at all on GitLab.com See merge request gitlab-org/gitlab-ce!23821
\| * \| \| \| \| \| \| \|	Clearly state web terminal is not supported at all	James Ramsay	2018-12-14	1	-2/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '34758-list-ancestor-clusters' into 'master'	Dmitriy Zaporozhets	2018-12-17	10	-6/+314
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show clusters of ancestors in cluster list page Closes #34758 See merge request gitlab-org/gitlab-ce!22996
\| * \| \| \| \| \| \| \| \|	Use finder to decide to show note to user	Thong Kuah	2018-12-17	4	-7/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Given the note is about how to interpret ancestor clusters, use the finder which actually knows if there are any ancestor clusters to find out if the note should be shown, rather than passing the same info via a view to a helper Added note about Kaminari.paginate_array Link to followup issue too
\| * \| \| \| \| \| \| \| \|	Check can :read_clusters in finder	Thong Kuah	2018-12-17	2	-3/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is in addtion to the can checks we have in the controller, as a finder can be used elsewhere in the future.
\| * \| \| \| \| \| \| \| \|	Move code to presenter	Thong Kuah	2018-12-17	5	-110/+168
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of the code such as #show_path is already present on the presenter. Also avoid having code in two places (helper and presenter) Sanitize and assert html_safe. Additional layer of defense - on top of GitLab already requiring group names to be composed of small set of chars A-Z, - and spaces. Only link to cluster if user can read cluster Make clear that arg is a GroupClusterablePresenter Add more specs for completeness
\| * \| \| \| \| \| \| \| \|	Refactor methods on ClusterHelper	Mayra Cabrera	2018-12-17	4	-58/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Use sprite_icon instead of hardcoded html - Use a more descriptive method name - Changes specs to use html_safe matcher
\| * \| \| \| \| \| \| \| \|	Cleans cluster views a bit	Mayra Cabrera	2018-12-17	3	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Moves logic into ClustersHelp - Add CSS to ensure compatibility with EE view.
\| * \| \| \| \| \| \| \| \|	Move group path display logic to helper	Thong Kuah	2018-12-17	3	-6/+98
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add specs