Skip to content

G
gitlab-ce
Commit ab24e114 authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve conflicts in app/controllers/projects/mirrors_controller.rb

parent 095c3299
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/controllers/projects/mirrors_controller.rb
View file @ ab24e114
class Projects::MirrorsController < Projects::ApplicationController class Projects::MirrorsController < Projects::ApplicationController
include RepositorySettingsRedirect include RepositorySettingsRedirect
<<<<<<< HEAD
prepend EE::Projects::MirrorsController prepend EE::Projects::MirrorsController
=======
>>>>>>> upstream/master
# Authorize # Authorize
before_action :remote_mirror, only: [:update] before_action :remote_mirror, only: [:update]
before_action :check_mirror_available! before_action :check_mirror_available!
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7