diff options
-rw-r--r-- | app/contexts/commit_load_context.rb | 4 | ||||
-rw-r--r-- | app/contexts/notes/load_context.rb | 2 | ||||
-rw-r--r-- | app/models/commit.rb | 4 | ||||
-rw-r--r-- | app/models/note.rb | 8 | ||||
-rw-r--r-- | app/models/project.rb | 12 | ||||
-rw-r--r-- | app/models/user.rb | 4 | ||||
-rw-r--r-- | app/models/users_project.rb | 26 | ||||
-rw-r--r-- | app/models/wiki.rb | 1 | ||||
-rw-r--r-- | app/views/commits/_commit.html.haml | 4 | ||||
-rw-r--r-- | spec/models/note_spec.rb | 6 |
10 files changed, 9 insertions, 62 deletions
diff --git a/app/contexts/commit_load_context.rb b/app/contexts/commit_load_context.rb index a14291b9b0d..1f23f633af3 100644 --- a/app/contexts/commit_load_context.rb +++ b/app/contexts/commit_load_context.rb @@ -13,12 +13,12 @@ class CommitLoadContext < BaseContext if commit commit = CommitDecorator.decorate(commit) - line_notes = project.commit_line_notes(commit) + line_notes = project.notes.for_commit_id(commit.id).inline result[:commit] = commit result[:note] = project.build_commit_note(commit) result[:line_notes] = line_notes - result[:notes_count] = line_notes.count + project.commit_notes(commit).count + result[:notes_count] = project.notes.for_commit_id(commit.id).count begin result[:suppress_diff] = true if commit.diffs.size > Commit::DIFF_SAFE_SIZE && !params[:force_show_diff] diff --git a/app/contexts/notes/load_context.rb b/app/contexts/notes/load_context.rb index 907c7c7ade2..a8f617a782b 100644 --- a/app/contexts/notes/load_context.rb +++ b/app/contexts/notes/load_context.rb @@ -9,7 +9,7 @@ module Notes @notes = case target_type when "commit" - project.commit_notes(project.repository.commit(target_id)).fresh.limit(20) + project.notes.for_commit_id(target_id).not_inline.fresh.limit(20) when "issue" project.issues.find(target_id).notes.inc_author.fresh.limit(20) when "merge_request" diff --git a/app/models/commit.rb b/app/models/commit.rb index 7e64c0f6e82..17d41f27f34 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -149,10 +149,6 @@ class Commit prev_commit.try :id end - def parents_count - parents && parents.count || 0 - end - # Shows the diff between the commit's parent and the commit. # # Cuts out the header and stats from #to_patch and returns only the diff. diff --git a/app/models/note.rb b/app/models/note.rb index abd89a8a46e..b055ae623b2 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -42,11 +42,11 @@ class Note < ActiveRecord::Base mount_uploader :attachment, AttachmentUploader # Scopes - scope :for_commits, ->{ where(noteable_type: "Commit") } + scope :for_commit_id, ->(commit_id) { where(noteable_type: "Commit", commit_id: commit_id) } + scope :inline, where("line_code IS NOT NULL") + scope :not_inline, where("line_code IS NULL") + scope :common, ->{ where(noteable_type: ["", nil]) } - scope :today, ->{ where("created_at >= :date", date: Date.today) } - scope :last_week, ->{ where("created_at >= :date", date: (Date.today - 7.days)) } - scope :since, ->(day) { where("created_at >= :date", date: (day)) } scope :fresh, ->{ order("created_at ASC, id ASC") } scope :inc_author_project, ->{ includes(:project, :author) } scope :inc_author, ->{ includes(:author) } diff --git a/app/models/project.rb b/app/models/project.rb index 2204d4a56e5..702f4b2bf81 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -83,10 +83,6 @@ class Project < ActiveRecord::Base scope :joined, ->(user) { where("namespace_id != ?", user.namespace_id) } class << self - def authorized_for user - raise "DERECATED" - end - def active joins(:issues, :notes, :merge_requests).order("issues.created_at, notes.created_at, merge_requests.created_at DESC") end @@ -215,14 +211,6 @@ class Project < ActiveRecord::Base notes.new(commit_id: commit.id, noteable_type: "Commit") end - def commit_notes(commit) - notes.where(commit_id: commit.id, noteable_type: "Commit", line_code: nil) - end - - def commit_line_notes(commit) - notes.where(commit_id: commit.id, noteable_type: "Commit").where("line_code IS NOT NULL") - end - def last_activity last_event end diff --git a/app/models/user.rb b/app/models/user.rb index 5e4815da865..341b96a0d91 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -230,10 +230,6 @@ class User < ActiveRecord::Base abilities.allowed?(self, action, subject) end - def last_activity_project - projects.first - end - def first_name name.split.first unless name.blank? end diff --git a/app/models/users_project.rb b/app/models/users_project.rb index 362b1a5d8e5..79146289836 100644 --- a/app/models/users_project.rb +++ b/app/models/users_project.rb @@ -106,28 +106,6 @@ class UsersProject < ActiveRecord::Base truncate_teams [project.id] end - def bulk_delete(project, user_ids) - UsersProject.transaction do - UsersProject.where(user_id: user_ids, project_id: project.id).each do |users_project| - users_project.skip_git = true - users_project.destroy - end - - project.update_repository - end - end - - def bulk_update(project, user_ids, project_access) - UsersProject.transaction do - UsersProject.where(user_id: user_ids, project_id: project.id).each do |users_project| - users_project.project_access = project_access - users_project.skip_git = true - users_project.save - end - project.update_repository - end - end - def roles_hash { guest: GUEST, @@ -147,10 +125,6 @@ class UsersProject < ActiveRecord::Base end end - def role_access - project_access - end - def update_repository gitolite.update_repository(project) end diff --git a/app/models/wiki.rb b/app/models/wiki.rb index 252a97e8cca..4f113957f99 100644 --- a/app/models/wiki.rb +++ b/app/models/wiki.rb @@ -50,5 +50,4 @@ class Wiki < ActiveRecord::Base def set_slug self.slug = self.title.parameterize end - end diff --git a/app/views/commits/_commit.html.haml b/app/views/commits/_commit.html.haml index 156ff1e9d85..eb0312d01e1 100644 --- a/app/views/commits/_commit.html.haml +++ b/app/views/commits/_commit.html.haml @@ -14,8 +14,8 @@ %span.notes_count - - notes = @project.commit_notes(commit) + @project.commit_line_notes(commit) + - notes = @project.notes.for_commit_id(commit.id) - if notes.any? - %span.btn.small.disabled.grouped + %span.btn.disabled.grouped %i.icon-comment = notes.count diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index 8e06e6748da..62e83b31b7f 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -34,12 +34,6 @@ describe Note do it { should validate_presence_of(:project) } end - describe "Scopes" do - it "should have a today named scope that returns ..." do - Note.today.where_values.should == ["created_at >= '#{Date.today}'"] - end - end - describe "Voting score" do let(:project) { create(:project) } |