Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock2
-rw-r--r--app/models/repository.rb10
3 files changed, 3 insertions, 10 deletions
diff --git a/Gemfile b/Gemfile
index f8aa096d6a8..035942fabf1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,6 @@ gem 'omniauth-twitter'
gem 'omniauth-github'
# Extracting information from a git repository
-gem 'rugged', '~> 0.17.0.b7'
gem "gitlab-grit", '~> 1.0.0', require: 'grit'
gem 'grit_ext', '~> 0.8.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0c96c35cd1d..fca92716a95 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -397,7 +397,6 @@ GEM
ruby-progressbar (1.0.2)
rubyntlm (0.1.1)
rubyzip (0.9.9)
- rugged (0.17.0.b7)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
sass (3.2.7)
@@ -566,7 +565,6 @@ DEPENDENCIES
redcarpet (~> 2.2.2)
redis-rails
rspec-rails
- rugged (~> 0.17.0.b7)
sass-rails (~> 3.2.5)
sdoc
seed-fu
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 93ead9e5d87..934c1a6e086 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -34,10 +34,6 @@ class Repository
@repo ||= Grit::Repo.new(path_to_repo)
end
- def rugged
- @rugged ||= Rugged::Repository.new(path_to_repo)
- end
-
def commit(commit_id = nil)
Commit.find_or_first(repo, commit_id, root_ref)
end
@@ -68,17 +64,17 @@ class Repository
# Returns an Array of branch names
def branch_names
- branches.map(&:name).sort
+ repo.branches.collect(&:name).sort
end
# Returns an Array of Branches
def branches
- rugged.branches.sort_by(&:name)
+ repo.branches.sort_by(&:name)
end
# Returns an Array of tag names
def tag_names
- rugged.tags.sort.reverse
+ repo.tags.collect(&:name).sort.reverse
end
# Returns an Array of Tags