diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 12:49:29 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 12:49:29 +0300 |
commit | 24332b7b99e63083a4914f149c43bf8cce5e7a92 (patch) | |
tree | de94c3e97a04760b1a2229adb7a10dd617f3d2ba /app/services | |
parent | d4cfa0bf766bb99cb6b8e600faee1e90678816b4 (diff) |
Revert "Make web editor work correctly after switch from satellites"
This reverts commit 435f680b897b892103fa157d4699dbb6d9ecf758.
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/files/base_service.rb | 3 | ||||
-rw-r--r-- | app/services/files/create_service.rb | 2 | ||||
-rw-r--r-- | app/services/files/delete_service.rb | 2 | ||||
-rw-r--r-- | app/services/files/update_service.rb | 2 | ||||
-rw-r--r-- | app/services/git_push_service.rb | 3 |
5 files changed, 5 insertions, 7 deletions
diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 4d02752454e..29013be0f97 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -17,8 +17,7 @@ module Files def after_commit(sha) commit = repository.commit(sha) full_ref = 'refs/heads/' + (params[:new_branch] || ref) - old_sha = commit.parent_id || Gitlab::Git::BLANK_SHA - GitPushService.new.execute(project, current_user, old_sha, sha, full_ref) + GitPushService.new.execute(project, current_user, commit.parent_id, sha, full_ref) end end end diff --git a/app/services/files/create_service.rb b/app/services/files/create_service.rb index 0a80455bc6b..bafc3565da1 100644 --- a/app/services/files/create_service.rb +++ b/app/services/files/create_service.rb @@ -1,7 +1,7 @@ require_relative "base_service" module Files - class CreateService < Files::BaseService + class CreateService < BaseService def execute allowed = Gitlab::GitAccess.new(current_user, project).can_push_to_branch?(ref) diff --git a/app/services/files/delete_service.rb b/app/services/files/delete_service.rb index 2281777604c..fabcdc19648 100644 --- a/app/services/files/delete_service.rb +++ b/app/services/files/delete_service.rb @@ -1,7 +1,7 @@ require_relative "base_service" module Files - class DeleteService < Files::BaseService + class DeleteService < BaseService def execute allowed = ::Gitlab::GitAccess.new(current_user, project).can_push_to_branch?(ref) diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 013cc1ee322..c972f8322bb 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -1,7 +1,7 @@ require_relative "base_service" module Files - class UpdateService < Files::BaseService + class UpdateService < BaseService def execute allowed = ::Gitlab::GitAccess.new(current_user, project).can_push_to_branch?(ref) diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb index 3511392d1d8..5a2c97b08af 100644 --- a/app/services/git_push_service.rb +++ b/app/services/git_push_service.rb @@ -133,8 +133,7 @@ class GitPushService end def is_default_branch?(ref) - Gitlab::Git.branch_ref?(ref) && - (Gitlab::Git.ref_name(ref) == project.default_branch || project.default_branch.nil?) + Gitlab::Git.branch_ref?(ref) && Gitlab::Git.ref_name(ref) == project.default_branch end def commit_user(commit) |