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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update docs to reflect new Security tabs12250-mvc-security-navigation-section-docs	Dave Pisek	2019-07-24	5	-3/+3
\| \| \| \| \| \| \| \| \| \| \|	This commit includes changes to update the documentation so it reflects the new navigation structure introduced by the additional tab "Security & Compliance" to the project-views sidebar and "Security" to the group-views sidebar. * Screenshot * Paths to the Dependency List * Paths to the group-level security dashboard
*	Merge branch 'allow-all-users-to-see-history' into 'master'	Mayra Cabrera	2019-07-23	4	-1/+166
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #29528, by allowing all users to view history Closes #29528 See merge request gitlab-org/gitlab-ce!30470
\| *	Allowing all users to view history	Alex Kalderimis	2019-07-23	4	-1/+166
\|/ \| \| \| \| \| \| \|	This removes the create_wiki permission check from the history controller, allowing show and history to have the same level of permissions. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29528
*	Merge branch '63894-encapsulate-file-view-modes-with-constants' into 'master'	Paul Slaughter	2019-07-23	5	-15/+27
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Encapsulate file view modes with constants Closes #63894 See merge request gitlab-org/gitlab-ce!30737
\| *	Encapsulate file view modes with constants	Chris Toynbee	2019-07-23	5	-15/+27
\|/
*	Merge branch '52442-initial-mysql-support-removal' into 'master'	Robert Speicher	2019-07-23	63	-1695/+352
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Remove dead mysql code Closes #63191 See merge request gitlab-org/gitlab-ce!29608
\| *	Remove dead MySQL code	Nick Thomas	2019-07-23	63	-1695/+352
\| \| \| \| \| \| \| \|	None of this code can be reached any more, so it can all be removed
* \|	Merge branch 'sh-update-mermaid' into 'master'	Tim Zallmann	2019-07-23	5	-300/+1506
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Mermaid to v8.2.3 Closes #64601 See merge request gitlab-org/gitlab-ce!30985
\| * \|	Update Mermaid to v8.2.3sh-update-mermaid	Stan Hu	2019-07-23	5	-300/+1506
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes fill colors not working with Mermaid and pulls in a number of other fixes. * https://github.com/knsv/mermaid/blob/master/CHANGELOG.md * https://github.com/knsv/mermaid/#special-note-regarding-version-82 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64601
* \| \|	Merge branch '64101-override-helm-release-name' into 'master'	Thong Kuah	2019-07-23	3	-4/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#64081 allow override of helm release name See merge request gitlab-org/gitlab-ce!30360
\| * \| \|	Rename changelog to correct issue number, be more explicit that we're ↵	James Keogh	2019-07-23	3	-4/+11
\|/ / / \| \| \| \| \| \| \| \| \|	talking about Auto DevOps projects
* \| \|	Merge branch 'sh-remove-opclasses-patch' into 'master'	Mayra Cabrera	2019-07-23	4	-893/+682
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove PostgreSQL opclasses monkey patch Closes #64529 and #59673 See merge request gitlab-org/gitlab-ce!30709
\| * \| \|	Remove PostgreSQL opclasses monkey patchsh-remove-opclasses-patch	Stan Hu	2019-07-23	4	-893/+682
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is no longer needed with Rails 5.2. opclass is the attribute used per https://github.com/rails/rails/pull/19090/files. Now that we've removed the monkey patch and restored the Rails schema dumper, it appears Rails has dropped the inclusion of `using: :btree` as well (https://github.com/rails/rails/pull/27981). Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64529
* \| \|	Merge branch 'remove-unused-begin-rescue-block' into 'master'	Stan Hu	2019-07-23	1	-5/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed up boot time See merge request gitlab-org/gitlab-ce!31072
\| * \| \|	Speed up boot time	Sergey Alekseev	2019-07-23	1	-5/+1
\| \| \|/ \| \|/\| \| \| \|	by removing an unused `begin ... rescue ... end` block. The block is no longer necessary after moving the bootsnap gem to the :default group in eedf735574b9f6c7c6c843943dd946ce84238236.
* \| \|	Merge branch 'adjust-group-level-analytics-to-accept-multiple-project-ids' ↵	Stan Hu	2019-07-23	11	-43/+118
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Adjust group level analytics to accept multiple projects ids See merge request gitlab-org/gitlab-ce!30744
\| * \| \|	Change sql query	Małgorzata Ksionek	2019-07-23	1	-3/+3
\| \| \| \|
\| * \| \|	Add code review remarksadjust-group-level-analytics-to-accept-multiple-project-ids	Małgorzata Ksionek	2019-07-23	11	-87/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add cr remarks Improve specs according to the review Fix schema Add cr remarks Fix naming Add cr remarks
\| * \| \|	Fix changelog merge request number	Małgorzata Ksionek	2019-07-23	1	-1/+1
\| \| \| \|
\| * \| \|	Add basic project extraction	Małgorzata Ksionek	2019-07-23	12	-89/+167
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To allow project filtering Prepare summary for accepting multiple groups Modify deploys group summary class Add filtering by project name in issues summary Fix rubocop offences Add changelog entry Change name to id in project filtering Fix rebase problem Add project extraction
* \| \| \|	Merge branch '44496-fqdn-validator' into 'master'	Mayra Cabrera	2019-07-23	3	-0/+172
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add validator for qualified domain array See merge request gitlab-org/gitlab-ce!31043
\| * \| \| \|	Add validator for qualidied domain array	Reuben Pereira	2019-07-23	3	-0/+172
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Validate that the entries contain no unicode, html tags and are not larger than 255 characters.
* \| \| \|	Merge branch 'GL-12412' into 'master'	Mayra Cabrera	2019-07-23	3	-0/+7
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Add PIP_DEPENDENCY_PATH to dependency scanning template See merge request gitlab-org/gitlab-ce!30762
\| * \| \|	Add PIP_DEPENDENCY_PATH to dependency scanning template	mo khan	2019-07-23	3	-0/+7
\|/ / /
* \| \|	Merge branch 'bvl-mark-remote-mirrors-as-failed-sooner' into 'master'	Robert Speicher	2019-07-23	3	-5/+19
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mark mirrors as failed 1 hour after they started See merge request gitlab-org/gitlab-ce!30999
\| * \| \|	Mark mirrors as failed 1 hour after they started	Bob Van Landuyt	2019-07-23	3	-5/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We call `Project#mark_stuck_remote_mirrors_as_failed!` from the `Git::BaseHooksService`. So that gets called every time we push tags or branches. Before this would only mark started mirrors as failed if they had been started 24 hours ago. A push would never take 24 hours, especially not when we run it so often. Lowering that threshold 1 hour should at least allow us to retry broken mirrors more often on pushes. The timeout for the initial push is set somewhat longer to accommodate for pushing large repos. Both numbers are currently picked arbitrarily.
* \| \| \|	Merge branch '12719-group-bulk-edit-merge-requests-change-milestone-ce' into ↵	Robert Speicher	2019-07-23	7	-31/+57
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' CE port for Group bulk edit merge requests See merge request gitlab-org/gitlab-ce!30569
\| * \| \| \|	CE port for Group bulk edit merge requests	Eugenia Grieff	2019-07-23	7	-31/+57
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add bulk update sidebar to merge requests template Add js to toggle sidebar Fix bulk update button in issues template Add specs for merge requests in bulk update service
* \| \| \|	Merge branch 'safe-archiving-for-traces' into 'master'	Kamil Trzciński	2019-07-23	16	-20/+214
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extra logging for new live trace architecture See merge request gitlab-org/gitlab-ce!30892
\| * \| \| \|	Validate the existence of archived traces before removing live tracesafe-archiving-for-traces	Shinya Maeda	2019-07-23	16	-20/+214
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Often live traces are removed even though the archived trace doesn't exist. This commit checkes the existence strictly.
* \| \| \| \|	Merge branch 'sh-use-shared-state-cluster-pubsub' into 'master'	Kamil Trzciński	2019-07-23	5	-4/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use persistent Redis cluster for Workhorse pub/sub notifications See merge request gitlab-org/gitlab-ce!30990
\| * \| \| \| \|	Use persistent Redis cluster for Workhorse pub/sub notificationssh-use-shared-state-cluster-pubsub	Stan Hu	2019-07-22	5	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, in Omnibus, Workhorse expected to listen via the Redis shared state cluster for the `workhorse:notifications` publish/subscribe channel, but the Rails code was using the Sidekiq queue cluster for this. To fix this inconsistency, we make the Rails code use the persistent cluster, since we don't want Workhorse to be looking at anything Sidekiq-related.
* \| \| \| \| \|	Merge branch '57953-fix-unfolded-diff-suggestions' into 'master'	Kamil Trzciński	2019-07-23	4	-12/+37
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix suggestion on lines that are not part of an MR See merge request gitlab-org/gitlab-ce!30606
\| * \| \| \| \|	Fix suggestion on lines that are not part of an MR57953-fix-unfolded-diff-suggestions	Patrick Bajao	2019-07-22	4	-12/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return the `text` as plain string in the response instead of including HTML tags but keep `rich_text` as is. The fix is to modify `Blob::UnfoldPresenter#diff_files` to map each raw diff line (limited by the range specified) to a corresponding line in an array of highlighted lines to use as `rich_text`.
* \| \| \| \| \|	Merge branch '64756-re-enable-junit-reports' into 'master'	Kamil Trzciński	2019-07-23	2	-9/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Junit reports Closes #64756 See merge request gitlab-org/gitlab-ce!30931
\| * \| \| \| \| \|	Enable Junit reports64756-re-enable-junit-reports	Steve Azzopardi	2019-07-19	2	-9/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30254 Junit reports were disabled. With https://gitlab.com/gitlab-com/gl-infra/production/issues/928 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30274 solved we should enable them again. closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64756
* \| \| \| \| \| \|	Merge branch '63485-fix-pipeline-emails-to-use-group-setting' into 'master'	Nick Thomas	2019-07-23	9	-50/+135
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make pipeline emails respect group email setting Closes #63485 See merge request gitlab-org/gitlab-ce!30907
\| * \| \| \| \| \| \|	Make pipeline emails respect group email setting63485-fix-pipeline-emails-to-use-group-setting	Heinrich Lee Yu	2019-07-23	9	-50/+135
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a user's notification email is set for a group, we should use that for pipeline emails
* \| \| \| \| \| \| \|	Merge branch '64974-remove-livesum-from-ruby-sampler-metrics' into 'master'	Kamil Trzciński	2019-07-23	2	-4/+9
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove :livesum from RubySampler metrics See merge request gitlab-org/gitlab-ce!31047
\| * \| \| \| \| \| \|	Remove :livesum from RubySampler metrics64974-remove-livesum-from-ruby-sampler-metrics	Aleksei Lipniagov	2019-07-23	2	-4/+9
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'bw-add-index-for-relative-position' into 'master'	Nick Thomas	2019-07-23	4	-1/+27
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add index for issues on relative position, project, and state for manual sorting See merge request gitlab-org/gitlab-ce!30542
\| * \| \| \| \| \| \| \|	Add index for issues on relative position, projectbw-add-index-for-relative-position	Brett Walker	2019-07-22	4	-1/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and state
* \| \| \| \| \| \| \| \|	Merge branch 'sh-enable-bootsnap' into 'master'	Douglas Barbosa Alexandre	2019-07-23	6	-5/+12
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Bootsnap available via ENABLE_BOOTSNAP=1 Closes #45230 See merge request gitlab-org/gitlab-ce!30963
\| * \| \| \| \| \| \| \| \|	Add docs for ENABLE_BOOTSNAPsh-enable-bootsnap	Stan Hu	2019-07-19	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Make Bootsnap available via ENABLE_BOOTSNAP=1	Stan Hu	2019-07-19	5	-5/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bootsnap speeds up Rails loading and now ships by default with Rails 5.2 apps. We should promote this to a default gem and test it out in production. This will also make it possible for the Helm Charts to take advantage of this. It appears that Bootsnap with Rails 5.2.3 and all the GitLab CE gems loads fine on an ARM platform now, so it's possible that https://gitlab.com/gitlab-org/gitlab-ce/issues/34799 has been resolved. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/45230
* \| \| \| \| \| \| \| \| \|	Merge branch 'sl-qa-staging-65-fix-correct-page-issue' into 'master'	Ramya Authappan	2019-07-23	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure test is on login page before attempting login See merge request gitlab-org/gitlab-ce!31040
\| * \| \| \| \| \| \| \| \| \|	Replace homepage visit stepsl-qa-staging-65-fix-correct-page-issue	Sanad Liaquat	2019-07-23	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Temporarily remove the before block to capture screenshots	Sanad Liaquat	2019-07-23	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Ensure test is on login page	Sanad Liaquat	2019-07-23	1	-0/+2
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'ce-port-315-log-impersonation-actions-in-audit-log' into 'master'	Ash McKenzie	2019-07-23	4	-4/+21
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Port: Log impersonation actions in audit log See merge request gitlab-org/gitlab-ce!31039