* upstream/master: (136 commits)
Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'"
Add modal for deleting a milestone
Revert "Merge branch 'remove-rugged-walk' into 'master'"
Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service"
Update CHANGELOG.md for 10.4.1
Add a gRPC health check to ensure Gitaly is up
Add formatted_data attribute to Git::WikiPage
Avoid array indices to fixtures in JS specs
Migrate .batch_lfs_pointers to Gitaly
Updates `Revert this merge request` text
Work around a bug in DatabaseCleaner when using the deletion strategy on MySQL
Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'
Workaround a recaptcha pop-up that cannot be tested
Uses sprite icon to render verified commit badge and uniforms css colors
Moves more mr widget components into vue files Adds i18n Adds better test coverage
Execute system hooks after-commit when executing project hooks
Remove one Spinach job and add one RSpec job
Remove callback as we already update accordingly on services
Fix typo in `.gitlab-ci.yml` heading
Migrate repository bundling to Gitaly
...
* upstream/master: (106 commits)
Remove callback as we already update accordingly on services
added missing imports
correctly imports performance bar
Added imports for dispatcher routes
Make the exposing of the Application secret more explicit
Add documentation about when the application API was added
Add application create API
Return a blank JSON response for a missing .js file to prevent Rails CSRF errors
add CHANGELOG.md entry for !15804
disable CopyAsGFM on iOS due to bug in webkit
Update changelog
GitalyClient::ConflictsService#conflicts? should return true for conflicts with missing side
Return more consistent values for merge_status on MR API
Fix a migration spec messing up the MergeRequestDiff DB schema
Backport changes to Gitlab::Checks::ChangeAccess from EE
remove webpack bundle tag for monitoring:environments:metrics
Set timezone for karma to UTC
Upgrade jasmine + raven to newer versions
Ensure Gitaly Ruby gems are installed using the correct Gemfile and at the correct location
Clarify that a feature that isn't in review by the 1st or 3rd doesn't necessarily miss the freeze
...
* Adds Runtime::Scenario as a place to record the properties of the
Scenario we're interested in.
* Adds a positional argument to Test::Integration::Mattermost to specify
Runtime::Scenario.mattermost
* Adds Page::Mattermost::{Main,Login} to model the mattermost pages we
need to interact with.
* Adds qa/features/mattermost/login_spec to perform a login via oauth
and ensure we are logged in.
Here we add a new entrypoint for the test suite,
Test::Integration::Mattermost. It is to ensure that mattermost
integration is working when enabling the embedded mattermost of
gitlab-omnibus
It runs all the example groups from Test::Instance, in addition to any
groups tagged :mattermost
* Extracts a common entrypoint class from Test::Instance as
Scenario::Entrypoint, and uses that as the base for Test::Instance and
Test::Integration::Mattermost
* RSpec groups defined in `specs/features/mattermost/**_spec.rb` are
tagged with :mattermost so they can be filtered out of the default
run.
* Tests tagged :mattermost are filtered out by default, and are
un-filtered by Test::Integration::Mattermost
Lin Jen-Shin
Grzegorz Bizon
Grzegorz Bizon
Brett Walker
Filipe Freire
Felipe Artur
Rémy Coutable
Richard Clamp
Robert Speicher