Conflicts:
TODO:
-
app/assets/javascripts/vue_pipelines_index/stage.js.es6 -
spec/services/projects/update_service_spec.rb -
spec/javascripts/issuable_time_tracker_spec.js.es6 -
doc/workflow/time_tracking.md
Resolved:
VERSION
app/assets/javascripts/vue_pipelines_index/stage.js.es6
app/assets/stylesheets/framework/variables.scss
app/controllers/projects/merge_requests_controller.rb
app/services/issuable_base_service.rb
doc/api/merge_requests.md
doc/workflow/README.md
features/steps/shared/project.rb
lib/gitlab/cycle_analytics/code_event.rb
lib/gitlab/cycle_analytics/code_event_fetcher.rb
lib/gitlab/cycle_analytics/review_event.rb
lib/gitlab/cycle_analytics/review_event_fetcher.rb
spec/features/issues/user_uses_slash_commands_spec.rb
spec/lib/gitlab/import_export/all_models.yml
spec/requests/api/merge_requests_spec.rb