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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert "Merge branch '52123-issuable-actions-notesfinder-pderichs' into ↵	Stan Hu	2019-07-27	7	-217/+7
\| \| \| \| \|	'master'" This reverts merge request !29733
*	Merge branch '52123-issuable-actions-notesfinder-pderichs' into 'master'	Stan Hu	2019-07-26	7	-7/+217
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Use NotesFinder to fetch notes in module IssuableActions Closes #52123 See merge request gitlab-org/gitlab-ce!29733
\| *	Use NotesFinder in module IssuableActions	Patrick Derichs	2019-07-26	7	-7/+217
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add spec for concern IssuableActions Add shared samples for discussions endpoint Add schema validations for discussions Fix rubocop style issue Make target assignable Use new possibility to provide target
* \|	Merge branch '19186-redirect-wiki-git-route-to-wiki' into 'master'	Stan Hu	2019-07-26	1	-0/+24
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Redirect project.wiki.git to project wiki home See merge request gitlab-org/gitlab-ce!31085
\| * \|	Redirect project.wiki.git to project wiki home19186-redirect-wiki-git-route-to-wiki	Luke Duncalfe	2019-07-26	1	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/19186
* \| \|	Changes capybara selector to qa-selector	Tanya Pazitny	2019-07-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Otherwise capybara hits ambiguous match.
* \| \|	Merge branch 'frozen_string_spec_lib' into 'master'	Stan Hu	2019-07-26	395	-18/+808
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add frozen_string_literal to spec/lib (part 1) See merge request gitlab-org/gitlab-ce!31130
\| * \| \|	Fix cannot modify frozen stringfrozen_string_spec_lib	Thong Kuah	2019-07-26	4	-18/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note that Performance/UnfreezeString recommends unary plus over "".dup, but unary plus has lower precedence so we have to use parenthesis
\| * \| \|	Add frozen_string_literal to spec/lib (part 1)	Thong Kuah	2019-07-26	395	-0/+790
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Using the sed script from https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
* \| \|	Merge branch '32495-improve-slack-notification-on-pipeline-status' into 'master'	Robert Speicher	2019-07-26	4	-90/+404
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make pipeline failure Slack notifications prettier and more informative Closes #32495 See merge request gitlab-org/gitlab-ce!27683
\| * \| \|	Improve pipeline status Slack notifications32495-improve-slack-notification-on-pipeline-status	Nathan Friend	2019-07-25	4	-90/+404
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds some formatting to the Slack notifications for pipeline statuses, as well as adds information about the stage and jobs that failed in the case of pipeline failure.
* \| \| \|	Merge branch 'rs-resource-label-events-api' into 'master'	Lin Jen-Shin	2019-07-26	2	-44/+45
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract resource_label_events API shared examples See merge request gitlab-org/gitlab-ce!31156
\| * \| \| \|	Simplify resource_label_events API shared examplers-resource-label-events-api	Robert Speicher	2019-07-25	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We don't need a repository, and we only need a private user in one example, so we can scope it locally there.
\| * \| \| \|	Extract resource_label_events API shared examples	Robert Speicher	2019-07-25	2	-42/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will allow us to reuse them in an EE-only spec.
* \| \| \| \|	Merge branch 'frozen_string_spec_factories' into 'master'	Michael Kozono	2019-07-26	118	-0/+236
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add frozen_string_literal to spec/factories See merge request gitlab-org/gitlab-ce!31129
\| * \| \| \| \|	Add frozen_string_literal to spec/factoriesfrozen_string_spec_factories	Thong Kuah	2019-07-26	118	-0/+236
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using the sed script from https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
* \| \| \| \|	Fix pid discovery for Unicorn in PidProvider	Aleksei Lipniagov	2019-07-26	1	-14/+52
\| \| \| \| \|
* \| \| \| \|	Merge branch 'remove-nested-groups-checks' into 'master'	Lin Jen-Shin	2019-07-26	105	-459/+253
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove code related to object hierarchy and MySQL Closes #65056 and #65055 See merge request gitlab-org/gitlab-ce!31095
\| * \| \| \| \|	Remove code related to object hierarchy in MySQLremove-nested-groups-checks	Heinrich Lee Yu	2019-07-25	105	-459/+253
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are not required because MySQL is not supported anymore
* \| \| \| \| \|	Merge branch 'mc/feature/find-all-artifacts-for-sha' into 'master'	Robert Speicher	2019-07-26	4	-55/+102
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Find build by sha from ref Closes #64534 and #45697 See merge request gitlab-org/gitlab-ce!30843
\| * \| \| \| \| \|	Extract common spec elements to shared_examplesmc/feature/find-all-artifacts-for-sha	Matija Čupić	2019-07-26	2	-92/+71
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Rename latest_successful to be more explicit	Matija Čupić	2019-07-26	2	-16/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Reword Project#latest_successful_build_for to Project#latest_successful_build_for_ref * Reword Ci::Pipeline#latest_successful_for to Ci::Pipeline#latest_successful_build_for_ref
\| * \| \| \| \| \|	Add specs for latest_successful methods for SHAs	Matija Čupić	2019-07-23	2	-0/+68
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Find build by sha from ref	Matija Čupić	2019-07-23	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds ability to find builds by sha when only specifying a ref.
* \| \| \| \| \| \|	Merge branch 'remove_deployment_metrics_deployment_platform_fallback' into ↵	Kamil Trzciński	2019-07-26	2	-15/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Remove fallback to deployment_platform_cluster in `DeploymentMetrics` See merge request gitlab-org/gitlab-ce!31126
\| * \| \| \| \| \| \|	Removes potentially incorrect, and slow fallbackremove_deployment_metrics_deployment_platform_fallback	Thong Kuah	2019-07-25	2	-15/+2
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deployment_platform is relatively expensive and calling this after the fact means that this may not be the cluster that was deployed to. Correspondingly reduce the leeway given in the related N+1 spec
* \| \| \| \| \| \|	Add severity for vulnerabilities	Tetiana Chupryna	2019-07-26	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'dm-submodule-links-nil' into 'master'	Nick Thomas	2019-07-26	2	-0/+60
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error rendering submodules in MR diffs when there is no .gitmodules See merge request gitlab-org/gitlab-ce!31162
\| * \| \| \| \| \| \|	Fix error rendering submodules in MR diffs when there is no .gitmodulesdm-submodule-links-nil	Douwe Maan	2019-07-26	2	-0/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Without this change, we get a NoMethodError on nil
* \| \| \| \| \| \| \|	Karma: Fix css selector for loading icon	Lukas 'Eipi' Eipert	2019-07-26	10	-15/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The GitLab UI update changed the spinner selector from `spinner` to `gl-spinner`, so we need to update it, so that our tests won't fail.
* \| \| \| \| \| \| \|	Add UndoStack class - a custom undo/redo engine	Martin Hanzel	2019-07-26	4	-3/+797
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It will be hooked up to the markdown editor later
* \| \| \| \| \| \| \|	Ensure Warden triggers after_authentication callback	Imre Farkas	2019-07-26	2	-10/+29
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By not triggering the callback: - ActiveSession lookup keys are not cleaned - Devise also misses its hook related to session cleanup
* \| \| \| \| \| \|	Merge branch '63568-access-email-notifications-custom-email' into 'master'	Lin Jen-Shin	2019-07-26	2	-8/+15
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Respect alt email when sending group access notifications See merge request gitlab-org/gitlab-ce!31089
\| * \| \| \| \| \| \|	Respect alt email when sending group access notifications63568-access-email-notifications-custom-email	Mario de la Ossa	2019-07-25	2	-8/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When sending access granted/rejected emails we should also respect custom emails set for groups/sub-groups
* \| \| \| \| \| \| \|	Feature test for gfm embedding metrics	Tristan Read	2019-07-26	2	-0/+68
\| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '65088-incorrect-message-interpolation-on-project-listing' into ↵	Fatih Acet	2019-07-25	1	-0/+13
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Incorrect message interpolation on project listing" Closes #65088 See merge request gitlab-org/gitlab-ce!31121
\| * \| \| \| \| \| \|	Fix incorrect use of message interpolation65088-incorrect-message-interpolation-on-project-listing	Alex Kalderimis	2019-07-24	1	-0/+13
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/65088
* \| \| \| \| \| \|	Merge branch 'print-sidekiq-class-name-in-memory-killer' into 'master'	Stan Hu	2019-07-25	1	-0/+3
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Logging sidekiq worker class name in SidekiqMemoryKiller See merge request gitlab-org/gitlab-ce!30996
\| * \| \| \| \| \|	Logging sidekiq worker class name in SidekiqMemoryKillerprint-sidekiq-class-name-in-memory-killer	Shinya Maeda	2019-07-25	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, SidekiqMemoryKiller does not feed worker class name in the json structured logging. This commit extends the json parameter.
* \| \| \| \| \| \|	Add default for outbound_local_requests_whitelist	Thong Kuah	2019-07-25	1	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It needs to default to an empty array logically.
* \| \| \| \| \| \|	Update namespace label text for managed clusters	Jacques Erasmus	2019-07-25	1	-0/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added the ability to update the namespace label text for gitlab-managed
* \| \| \| \| \| \|	Merge branch 'frozen_string_spec_support' into 'master'	Douwe Maan	2019-07-25	249	-6/+506
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add frozen_string_literal to spec/support See merge request gitlab-org/gitlab-ce!31132
\| * \| \| \| \| \| \|	Frozen string cannot change encodingfrozen_string_spec_support	Thong Kuah	2019-07-26	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was shown in specs but surely this will be happening in application code as well if this method is passes a frozen string. We were also trying to force_encode a OmniAuth::AuthHash which had the very confusing behaviour of returning nil when it was sent a method that it did not define. Fix that by only force_encoding a String.
\| * \| \| \| \| \| \|	Fix frozen string error	Thong Kuah	2019-07-25	2	-5/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add frozen_string_literal to spec/support	Thong Kuah	2019-07-25	247	-0/+494
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using the sed script from https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
* \| \| \| \| \| \|	Merge branch 'label-descr-push-opts' into 'master'	Lin Jen-Shin	2019-07-25	1	-0/+154
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support title and desc on merge w/ push option See merge request gitlab-org/gitlab-ce!31068
\| * \| \| \| \| \|	Support title and desc on merge w/ push optionlabel-descr-push-opts	Christian Couder	2019-07-24	1	-0/+154
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MergeRequests::PushOptionsHandlerService has been updated to allow creating and updating merge requests with the `title` and `description` set using git push options. To create a new merge request and set its title and description: git push -u origin -o merge_request.create \ -o merge_request.title="My title" \ -o merge_request.description="My description" To update an existing merge request and set its title and description: git push -u origin -o merge_request.title="My title" \ -o merge_request.description="My description" Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/64320
* \| \| \| \| \| \|	Merge branch '54478-table_exists-not-compatible-with-rails-5-1' into 'master'	Douglas Barbosa Alexandre	2019-07-25	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "table_exists? not compatible with Rails 5.1" Closes #54478 See merge request gitlab-org/gitlab-ce!30832
\| * \| \| \| \| \| \|	Remove unneeded monkey-patch54478-table_exists-not-compatible-with-rails-5-1	Heinrich Lee Yu	2019-07-25	1	-1/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes all calls to data_source_exists? to table_exists? since that is the intent of these calls
* \| \| \| \| \| \|	Merge branch 'sh-support-docker-oci-images' into 'master'	Dmitriy Zaporozhets	2019-07-25	3	-2/+38
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support Docker OCI images Closes gitlab-ee#12877 and #58685 See merge request gitlab-org/gitlab-ce!31127