CE Upstream - Monday
Conflicts
-
both modified: .gitlab-ci.yml -
both modified: CHANGELOG.md -
both modified: app/assets/javascripts/environments/components/environment_item.vue -
both added: app/assets/javascripts/environments/components/environments_table.vue -
both modified: app/controllers/concerns/membership_actions.rb -
both modified: app/controllers/groups/group_members_controller.rb -
both modified: app/controllers/projects/project_members_controller.rb -
both modified: app/helpers/issuables_helper.rb -
both modified: app/models/project_team.rb -
both modified: app/views/projects/new.html.haml -
both modified: db/schema.rb -
both modified: doc/ci/autodeploy/index.md -
both modified: doc/university/glossary/README.md -
both modified: doc/user/project/merge_requests/index.md -
both added: doc/user/project/milestones/index.md -
both modified: lib/banzai/renderer.rb -
both modified: spec/lib/banzai/renderer_spec.rb