-
GitLab Bot authored
# Conflicts: # .flayignore # CHANGELOG.md # app/assets/javascripts/pages/milestones/shared/components/promote_milestone_modal.vue # app/controllers/projects/milestones_controller.rb # app/helpers/page_layout_helper.rb # app/models/ci/runner.rb # app/views/ci/variables/_variable_row.html.haml # app/views/import/github/new.html.haml # app/views/layouts/nav/sidebar/_project.html.haml # app/views/projects/new.html.haml # app/views/shared/_import_form.html.haml # doc/install/README.md # spec/features/groups/activity_spec.rb # spec/features/groups/issues_spec.rb # spec/features/groups/show_spec.rb # spec/javascripts/fixtures/projects.rb # spec/services/ci/retry_build_service_spec.rb [ci skip]
3c3def3c