summaryrefslogtreecommitdiff
path: root/app/services/files/update_service.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-11-24 17:18:17 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-11-24 17:18:17 +0800
commit12f07300d0aa63301f50fd67d013d0ce25baa42c (patch)
tree8809a2eb4456e5a97e9baa90389255fdf5477b25 /app/services/files/update_service.rb
parentb82f415f09dd67da010a8c08397a13499e70efeb (diff)
parent3943e632103271b3683e0cc355f0fef4c9452491 (diff)
downloadgitlab-ce-12f07300d0aa63301f50fd67d013d0ce25baa42c.tar.gz
Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creating-file
* upstream/master: (141 commits) Log mv_namespace parameters Remove header ids from University docs Added test that checks the correct select box is there for the LFS enabled setting. Simplify copy on "Create a new list" dropdown in Issue Boards Fix `LFS enabled` select box. Use Commit#author so we share logic and cache Move admin abuse report spinach test to rspec fixes non-retina shadow and browser zoom issue Use default `closest` if available! Adds polyfill for CustomEvent Move abuse report spinach test to rspec Add support of Chrome/Chromium in requirements.md Fixed dragging issues on issue boards Grapify the sidekiq metrics API Add nested groups support to the routing Correctly determine mergeability of MR with no discussions API: Add endpoint to delete a group share Add a starting date to milestones Update ProjectTeam#fetch_members to use project authorizations Update ProjectTeam#max_member_access_for_user_ids to use project authorizations ...
Diffstat (limited to 'app/services/files/update_service.rb')
-rw-r--r--app/services/files/update_service.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb
index 14e5af4d8c6..67d473d4978 100644
--- a/app/services/files/update_service.rb
+++ b/app/services/files/update_service.rb
@@ -1,5 +1,3 @@
-require_relative "base_service"
-
module Files
class UpdateService < Files::BaseService
class FileChangedError < StandardError; end