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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Include fixed-width mixin instead of extending the classremove-extend-fixed-width	Annabel Dunstone Gray	2019-04-11	1	-8/+3
\|
*	Merge branch 'restore-hipchat' into 'master'	Nick Thomas	2019-04-11	26	-27/+963
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Remove HipChat integration from GitLab" Closes #60042 See merge request gitlab-org/gitlab-ce!27172
\| *	Restore index on services.type	Sean McGivern	2019-04-11	2	-0/+21
\| \|
\| *	Add frozen_string_literal to HipChat filesrestore-hipchat	Sean McGivern	2019-04-10	3	-0/+5
\| \|
\| *	Fix UrlBlocker spec	Sean McGivern	2019-04-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The newer version of HTTParty we now use will try harder to get a valid URL out of a relative one. Unfortunately, when there's no room (as was the case in this spec), the relative URL begins with `//`, which is actually a protocol-relative URL, not a simple path. Adding a room - which will always be the case in 'real life' - fixes this.
\| *	Add changelog entry	Sean McGivern	2019-04-10	1	-0/+5
\| \|
\| *	Revert "Remove HipChat integration from GitLab"	Sean McGivern	2019-04-10	27	-48/+953
\| \| \| \| \| \| \| \|	This reverts commit a5378665a1dc0b9c8dc3a4fa279a0eb78aac5aac.
* \|	Merge branch 'qa-staging-53-quarantine-issue-suggesstions-spec' into 'master'	Rémy Coutable	2019-04-11	1	-1/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Quarantine Issue suggestions spec See merge request gitlab-org/gitlab-ce!27259
\| * \|	Qurantine Issue suggestions spec	Sanad Liaquat	2019-04-11	1	-1/+2
\| \| \|
* \| \|	Merge branch 'docs/repo-mirrors-and-sidekiq' into 'master'	Achilleas Pipinellis	2019-04-11	1	-6/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Better documentation on repo mirroring enqueuing Closes gitlab-ee#10345 See merge request gitlab-org/gitlab-ce!27093
\| * \| \|	Better documentation on repo mirroring enqueuing	Evan Read	2019-04-11	1	-6/+11
\|/ / /
* \| \|	Merge branch 'docs-pages-intro' into 'master'	Achilleas Pipinellis	2019-04-11	8	-367/+92
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Refactor Pages' intro guide See merge request gitlab-org/gitlab-ce!27136
\| * \| \|	Refactor intro guide	Marcia Ramos	2019-04-11	8	-367/+92
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundancies: - Domains - User/group/project sites
* \| \|	Merge branch 'docs/add-whitepaper-note' into 'master'	Achilleas Pipinellis	2019-04-11	1	-0/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edits for GKE whitepaper note Closes gitlab-ee#11103 See merge request gitlab-org/gitlab-ce!27243
\| * \| \|	Edits for GKE whitepaper note	Evan Read	2019-04-11	1	-0/+6
\|/ / /
* \| \|	Merge branch 'fixed-web-ide-merge-request-review' into 'master'	Kushal Pandya	2019-04-11	4	-0/+47
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes Web IDE not loading merge request files Closes #60243 See merge request gitlab-org/gitlab-ce!27225
\| * \| \|	Fixes Web IDE not loading merge request files	Phil Hughes	2019-04-11	4	-0/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60243
* \| \| \|	Merge branch 'revert-24704-download-repository-path' into 'master'	Rémy Coutable	2019-04-11	18	-136/+63
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch '24704-download-repository-path' into 'master'" See merge request gitlab-org/gitlab-ce!27249
\| * \| \| \|	Revert "Merge branch '24704-download-repository-path' into 'master'"revert-24704-download-repository-path	Patrick Bajao	2019-04-11	18	-136/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 6c75bd015cba181f028bc87c396c3d8e43b5dc3e, reversing changes made to 1be7f5aaa38aba79843eae8835be6c99c025e982.
* \| \| \| \|	Merge branch '60278-fix-development-seed' into 'master'	Douwe Maan	2019-04-11	3	-4/+6
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ApplicationSetting development seed Closes #60278 See merge request gitlab-org/gitlab-ce!27213
\| * \| \| \|	Fix ApplicationSetting development seed60278-fix-development-seed	Rémy Coutable	2019-04-10	3	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It could happen that there's a cached (in Redis) ApplicationSetting record, and calling `Gitlab::CurrentSettings.current_application_settings` only returns it instead of creating a new DB record, which makes the `ApplicationSetting.current_without_cache.update!` call fail. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch ↵	Filipa Lacerda	2019-04-11	3	-10/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'59928-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-stat_graph-scss' into 'master' Resolve "Fix the following style-lint errors and warnings for `app/assets/stylesheets/pages/stat_graph.scss`" Closes #59928 See merge request gitlab-org/gitlab-ce!27180
\| * \| \| \| \|	Create svg-w-100 utility class for svg containers59928-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-stat_graph-scss	Jose Vargas	2019-04-10	3	-10/+8
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	The class makes a svg tag 100% width
* \| \| \| \|	Merge branch 'limit-amount-of-created-pipelines' into 'master'	Grzegorz Bizon	2019-04-11	5	-15/+70
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Process at most 4 pipelines during push See merge request gitlab-org/gitlab-ce!27205
\| * \| \| \| \|	Process at most 4 pipelines during pushlimit-amount-of-created-pipelines	Kamil Trzciński	2019-04-10	5	-15/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds a limitation that we will try to create pipeline for at most 4 first changes (branches and tags). This does not affect processing of Pipelines for Merge Requests, as each updated MR will have associated pipeline created.
* \| \| \| \| \|	Merge branch ↵	Lin Jen-Shin	2019-04-11	2	-4/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'ce-6120-extract-ee-specific-files-lines-for-spec-services-merge_requests' into 'master' [CE-port] Extract EE specific files/lines for spec/services/merge_requests See merge request gitlab-org/gitlab-ce!26977
\| * \| \| \| \| \|	Fix naming of testce-6120-extract-ee-specific-files-lines-for-spec-services-merge_requests	Heinrich Lee Yu	2019-04-11	2	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ALso makes it consistent with EE
* \| \| \| \| \| \|	Merge branch 'jc-guard-against-empty-dereferenced_target' into 'master'	Sean McGivern	2019-04-11	3	-1/+13
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Guard against nil dereferenced_target Closes #60076 See merge request gitlab-org/gitlab-ce!27192
\| * \| \| \| \| \| \|	Guard against nil dereferenced_targetjc-guard-against-empty-dereferenced_target	John Cai	2019-04-10	3	-1/+13
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'winh-eslint-jest' into 'master'	Phil Hughes	2019-04-11	1	-5/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable eslint-plugin-jest for Jest Closes #59636 See merge request gitlab-org/gitlab-ce!26715
\| * \| \| \| \| \| \| \|	Replace individual ESLint rules with jest/recommendedwinh-eslint-jest	Winnie Hellmann	2019-04-10	1	-5/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'winh-delete-static_fixtures.rb' into 'master'	Phil Hughes	2019-04-11	3	-30/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delete static_fixtures.rb for static HAML fixtures Closes #59200 See merge request gitlab-org/gitlab-ce!27145
\| * \| \| \| \| \| \| \| \|	Delete static_fixtures.rb for static HAML fixtures	Winnie Hellmann	2019-04-11	3	-30/+15
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'gt-fix-styling-for-pages-import' into 'master'	Phil Hughes	2019-04-11	2	-3/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix styling for `app/assets/stylesheets/pages/detail_page.scss` Closes #59909 See merge request gitlab-org/gitlab-ce!26873
\| * \| \| \| \| \| \| \| \|	Replace properties with utility class	George Tsiolis	2019-04-10	2	-3/+1
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch ↵	Sean McGivern	2019-04-11	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'3353-trainee-backend-maintainer-ash-mckenzie-update-codeowners' into 'master' Add @ashmckenzie to backend CODEOWNERS Closes gitlab-com/www-gitlab-com#3353 See merge request gitlab-org/gitlab-ce!27204
\| * \| \| \| \| \| \| \| \|	Add @ashmckenzie to backend CODEOWNERS3353-trainee-backend-maintainer-ash-mckenzie-update-codeowners	Ash McKenzie	2019-04-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Kushal Pandya	2019-04-11	1	-3/+16
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'10017-move-ee-differences-for-app-assets-javascripts-boards-models-list-js' into 'master' Backport of Resolve "Move EE differences for `app/assets/javascripts/boards/models/list.js`" See merge request gitlab-org/gitlab-ce!27198
\| * \| \| \| \| \| \| \| \|	Backported changes from EE for board list model10017-move-ee-differences-for-app-assets-javascripts-boards-models-list-js	Constance Okoghenun	2019-04-10	1	-3/+16
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch ↵	Kushal Pandya	2019-04-11	1	-1/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'10016-move-ee-differences-for-app-assets-javascripts-boards-models-issue-js' into 'master' Backport of "Move EE differences for `app/assets/javascripts/boards/models/issue.js`" See merge request gitlab-org/gitlab-ce!27197
\| * \| \| \| \| \| \| \| \|	Backported changes from EE for board issue model10016-move-ee-differences-for-app-assets-javascripts-boards-models-issue-js	Constance Okoghenun	2019-04-10	1	-1/+15
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'fix/url_validator_' into 'master'	James Lopez	2019-04-11	21	-172/+292
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Align UrlValidator to validate_url gem implementation See merge request gitlab-org/gitlab-ce!27194
\| * \| \| \| \| \| \| \| \|	Align UrlValidator to validate_url gem implementation.	Thong Kuah	2019-04-11	21	-172/+292
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Renamed UrlValidator to AddressableUrlValidator to avoid 'url:' naming collision with ActiveModel::Validations::UrlValidator in 'validates' statement. Make use of the options attribute of the parent class ActiveModel::EachValidator. Add more options: allow_nil, allow_blank, message. Renamed 'protocols' option to 'schemes' to match the option naming from UrlValidator.
* \| \| \| \| \| \| \| \|	Merge branch 'patch-15' into 'master'	Evan Read	2019-04-11	1	-4/+9
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ci/yaml: add version info to changes only/except See merge request gitlab-org/gitlab-ce!24062
\| * \| \| \| \| \| \| \| \|	ci/yaml: add version info to changes only/except	Elan Ruusamäe	2019-04-11	1	-4/+9
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'vzagorodny-clarify-shell-cmds-link-title-ce' into 'master'	Evan Read	2019-04-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify "Shell commands" link title in style guide doc See merge request gitlab-org/gitlab-ce!27241
\| * \| \| \| \| \| \| \| \|	Clarify "Shell commands" link title in style guide doc	Victor Zagorodny	2019-04-11	1	-1/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '60164-docs-feedback-write-your-title' into 'master'	Evan Read	2019-04-10	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Time Tracking feature link Closes #60164 See merge request gitlab-org/gitlab-ce!27211
\| * \| \| \| \| \| \| \| \|	Update Time Tracking feature link60164-docs-feedback-write-your-title	Mark Fletcher	2019-04-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-docs-lint-ci' into 'master'	Douglas Barbosa Alexandre	2019-04-10	3	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove executable bits from documentation images See merge request gitlab-org/gitlab-ce!27242