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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add 'bundle exec' to the 'bin/qa' calls in qa/README.mddocs-fix-bin-qa-command	Rémy Coutable	2019-04-09	1	-8/+10
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch '6573-extract-ee-spec-features-boards-ce' into 'master'	Robert Speicher	2019-04-09	2	-0/+8
\|\ \| \| \| \| \| \| \| \|	CE: Resolve "Extract EE specific files/lines for spec/features/boards" See merge request gitlab-org/gitlab-ce!27110
\| *	Add helper reference6573-extract-ee-spec-features-boards-ce	charlieablett	2019-04-08	1	-0/+1
\| \|
\| *	Abstract out method from spec to support	charlieablett	2019-04-08	2	-0/+7
\| \|
* \|	Merge branch 'osw-schedule-multiple-mr-assignees-ff-auto-enabling' into 'master'	Yorick Peterse	2019-04-09	2	-6/+62
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add methods to check dead and retrying jobs See merge request gitlab-org/gitlab-ce!27149
\| * \|	Add methods to check dead and retrying jobsosw-schedule-multiple-mr-assignees-ff-auto-enabling	Oswaldo Ferreira	2019-04-08	2	-6/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It adds two methods for checking if a background job (for a given class) has dead or retrying jobs.
* \| \|	Merge branch 'sl-lower-remove-rspec-retries' into 'master'	Sean McGivern	2019-04-09	7	-9/+13
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce rspec retries See merge request gitlab-org/gitlab-ce!26934
\| * \| \|	Reduce number of rspec retries	Sanad Liaquat	2019-04-09	7	-9/+13
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	In both e2e QA tests and unit tests, reduce the number of retires to 2 (i.e., 1 initial and one retry)
* \| \|	Merge branch 'improve/rack-clean-path-info' into 'master'	Douwe Maan	2019-04-09	1	-32/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Rack::Utils.clean_path_info instead of copy-pasted version. See merge request gitlab-org/gitlab-ce!27001
\| * \| \|	Use Rack::Utils.clean_path_info instead of copy-pasted version.	Vasiliy Ermolovich	2019-04-04	1	-32/+1
\| \| \| \|
* \| \| \|	Merge branch '60162-fix-time-windows' into 'master'	Douwe Maan	2019-04-09	5	-14/+51
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve Environments#additional_metrics TypeError, ensure unix format Closes #60162 See merge request gitlab-org/gitlab-ce!27118
\| * \| \| \|	Resolve Environments#additional_metrics TypeError, ensure unix format	Sarah Yasonik	2019-04-09	5	-14/+51
\|/ / / /
* \| \| \|	Merge branch 'delay-update-statictics' into 'master'	Douwe Maan	2019-04-09	9	-24/+146
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the bug that the project statistics is not updated See merge request gitlab-org/gitlab-ce!26854
\| * \| \| \|	Refactor: extract duplicate steps to a service class	Hiroyuki Sato	2019-04-05	6	-53/+79
\| \| \| \| \|
\| * \| \| \|	Update the project statistics immediatelly	Hiroyuki Sato	2019-04-05	2	-0/+11
\| \| \| \| \|
\| * \| \| \|	Refactor project_cache_worker_key	Hiroyuki Sato	2019-04-05	2	-2/+2
\| \| \| \| \|
\| * \| \| \|	Fix the bug that the project statistics is not updated	Hiroyuki Sato	2019-04-05	7	-22/+107
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs-fix-page-specific-javascript-link' into 'master'	Achilleas Pipinellis	2019-04-09	1	-3/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix page specific JavaScript link in documentation See merge request gitlab-org/gitlab-ce!27162
\| * \| \| \| \|	Fix page specific JavaScript link in documentation	Mark Florian	2019-04-09	1	-3/+3
\|/ / / / /
* \| \| \| \|	Merge branch 'docs/update-registry-user' into 'master'	Achilleas Pipinellis	2019-04-09	1	-17/+18
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update auth with registry docs See merge request gitlab-org/gitlab-ce!27148
\| * \| \| \| \|	Update auth with registry docs	Evan Read	2019-04-09	1	-17/+18
\|/ / / / /
* \| \| \| \|	Merge branch '46326-environment-url-validation' into 'master'	Kamil Trzciński	2019-04-09	2	-0/+42
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add environment url validation Closes #46326 See merge request gitlab-org/gitlab-ce!26805
\| * \| \| \| \|	Add environment url validation	Wolphin	2019-04-09	2	-0/+42
\|/ / / / /
* \| \| \| \|	Merge branch 'prevent-running-mr-pipelines-when-target-updated' into 'master'	Kamil Trzciński	2019-04-09	3	-9/+40
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create pipelines for merge requests only when source branch is updated See merge request gitlab-org/gitlab-ce!26921
\| * \| \| \| \|	Prevent triggering pipelines when target branch is updatedprevent-running-mr-pipelines-when-target-updated	Shinya Maeda	2019-04-08	3	-9/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, pipelines for merge requests are triggered when source or target branch is updated. However, we should create only when source branch is updated, because it runs unexpected pipelines.
* \| \| \| \| \|	Merge branch '30157-api-expose-single-environment' into 'master'	Kamil Trzciński	2019-04-09	11	-4/+322
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add new API endpoint to expose single environment Closes #30157 See merge request gitlab-org/gitlab-ce!26887
\| * \| \| \| \| \|	Add new API endpoint to expose single environment	Krasimir Angelov	2019-04-09	11	-4/+322
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is resolving https://gitlab.com/gitlab-org/gitlab-ce/issues/30157. Implement new API endpoint `/projects/:id/environments/:environment_id` to expose single environment. Include information for environment's last deployment if there is one.
* \| \| \| \| \|	Merge branch 'winh-jest-no-jasmine-globals' into 'master'	Kushal Pandya	2019-04-09	7	-13/+14
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable ESLint rule jest/no-jasmine-globals See merge request gitlab-org/gitlab-ce!27137
\| * \| \| \| \| \|	Replace jasmine.createSpy() with jest.fn()	Winnie Hellmann	2019-04-09	3	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Run yarn eslint --fix	Winnie Hellmann	2019-04-09	4	-10/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Enable ESLint rule jest/no-jasmine-globals	Winnie Hellmann	2019-04-09	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch ↵	Phil Hughes	2019-04-09	2	-1/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'ce-6099-move-ee-differences-for-app-views-admin-users-show-html-haml' into 'master' CE backport: Move EE differences for `app/views/admin/users/show.html.haml` Closes gitlab-ee#6099 See merge request gitlab-org/gitlab-ce!26874
\| * \| \| \| \| \| \|	CE port: Move EE differences for `app/views/admin/users/show.html.haml`ce-6099-move-ee-differences-for-app-views-admin-users-show-html-haml	Dennis Tang	2019-04-09	2	-1/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '59708-vendor-css' into 'master'	Phil Hughes	2019-04-09	5	-92/+101
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds a vendors folder for third party CSS Closes #59694 and #59708 See merge request gitlab-org/gitlab-ce!27119
\| * \| \| \| \| \| \| \|	Adds a vendors folder for third party CSS	Filipa Lacerda	2019-04-09	5	-92/+101
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Does not run stylelint for the vendors folder
* \| \| \| \| \| \| \|	Merge branch 'note-body-ee-differences' into 'master'	Filipa Lacerda	2019-04-09	2	-3/+13
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed EE differences in note_body.vue Closes gitlab-ee#9968 See merge request gitlab-org/gitlab-ce!27126
\| * \| \| \| \| \| \| \|	Fixed EE differences in note_body.vue	Phil Hughes	2019-04-08	2	-3/+13
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'winh-filtered_search_boards' into 'master'	Phil Hughes	2019-04-09	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove EE-specific changes from FilteredSearchBoards (CE-backport) See merge request gitlab-org/gitlab-ce!27122
\| * \| \| \| \| \| \| \| \|	Remove EE-specific changes from FilteredSearchBoardswinh-filtered_search_boards	Winnie Hellmann	2019-04-08	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 250c9b9ecfc35b6b828f6e1a471a803f74daf7f2)
* \| \| \| \| \| \| \| \| \|	Merge branch 'revert-e4b2c3b0' into 'master'	Stan Hu	2019-04-09	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'fix-ide-web-worker-relative-url' into 'master'" Closes #60217 See merge request gitlab-org/gitlab-ce!26066
\| * \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'fix-ide-web-worker-relative-url' into 'master'"revert-e4b2c3b0	Mike Greiling	2019-04-09	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !26015
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'issue-58418-release-notes' into 'master'	Rémy Coutable	2019-04-09	10	-21/+106
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set Release Name When Adding Release Notes to an Existing Tag Closes #58418 See merge request gitlab-org/gitlab-ce!26807
\| * \| \| \| \| \| \| \| \| \| \|	Set release name when adding release notes to an existing tag	Jason Goodman	2019-04-09	10	-21/+106
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also set the release sha and author
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'gitlab-managed-apps' into 'master'	Evan Read	2019-04-09	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Name GitLab managed apps See merge request gitlab-org/gitlab-ce!27129
\| * \| \| \| \| \| \| \| \| \|	Name GitLab managed appsgitlab-managed-apps	Sid Sijbrandij	2019-04-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix_qa_auto_devops_ci_masking_variable' into 'master'	Ramya Authappan	2019-04-09	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QA: Change CI value to something that can be masked See merge request gitlab-org/gitlab-ce!27146
\| * \| \| \| \| \| \| \| \| \| \|	Change value to something that can be maskedfix_qa_auto_devops_ci_masking_variable	Thong Kuah	2019-04-09	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The current value cannot be masked[1] but CI variables default to masked. Rather than implementing a toggle for the masking control, simply change the value to something that can be masked. [1] Currently, "simple" values can be masked: * it should be a single line * it should not have escape characters * it should not use variables * it should not have any whitespace * it should be longer than 8 characters https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25476
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs-anchors-predefined-variables' into 'master'	Evan Read	2019-04-09	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Update predefined_variables.md to fix anchor See merge request gitlab-org/gitlab-ce!27127
\| * \| \| \| \| \| \| \| \| \| \| \|	Docs: Update predefined_variables.md to fix anchor	Marcel Amirault	2019-04-09	1	-1/+1
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'patch-50' into 'master'	Evan Read	2019-04-09	1	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Okta configuration notes See merge request gitlab-org/gitlab-ce!27076