Commit 413a310f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

fixed blame and mr factory

parent 7e8bf92b
......@@ -8,6 +8,7 @@ class BlameController < ProjectResourceController
before_filter :require_non_empty_project
def show
@blob = Gitlab::Git::Blob.new(@repository, @commit.id, @ref, @path)
@blame = Gitlab::Git::Blame.new(project.repository, @commit.id, @path)
end
end
......@@ -15,9 +15,9 @@
.file_title
%i.icon-file
%span.file_name
= @tree.name
%small= number_to_human_size @tree.size
%span.options= render "tree/blob_actions"
= @blob.name
%small= number_to_human_size @blob.size
%span.options= render "blob/actions"
.file_content.blame
%table
- current_line = 1
......
......@@ -6,7 +6,7 @@
-# only show normal/blame view links for text files
- if @blob.text?
- if current_page? project_blame_path(@project, @id)
= link_to "normal view", project_tree_path(@project, @id), class: "btn btn-tiny"
= link_to "normal view", project_blob_path(@project, @id), class: "btn btn-tiny"
- else
= link_to "blame", project_blame_path(@project, @id), class: "btn btn-tiny"
= link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny"
......@@ -23,7 +23,7 @@ class PostReceive
user = if identifier.blank?
# Local push from gitlab
email = project.repository.commit(newrev).author.email rescue nil
email = project.repository.commit(newrev).author_email rescue nil
User.find_by_email(email) if email
elsif identifier =~ /\Auser-\d+\Z/
......
......@@ -205,7 +205,7 @@ module SharedPaths
end
Given 'I visit blob file from repo' do
visit project_tree_path(@project, File.join(ValidCommit::ID, ValidCommit::BLOB_FILE_PATH))
visit project_blob_path(@project, File.join(ValidCommit::ID, ValidCommit::BLOB_FILE_PATH))
end
Given 'I visit project source page for "8470d70"' do
......
......@@ -86,9 +86,11 @@ FactoryGirl.define do
target_branch "master" # pretend bcf03b5d~3
source_branch "stable" # pretend bcf03b5d
st_commits do
[Commit.new(project.repository.commit('bcf03b5d')),
Commit.new(project.repository.commit('bcf03b5d~1')),
Commit.new(project.repository.commit('bcf03b5d~2'))]
[
project.repository.commit('bcf03b5d').to_hash,
project.repository.commit('bcf03b5d~1').to_hash,
project.repository.commit('bcf03b5d~2').to_hash
]
end
st_diffs do
project.repo.diff("bcf03b5d~3", "bcf03b5d")
......
......@@ -20,6 +20,8 @@ describe Gitlab::Git::Commit do
author: @author,
committer: @committer,
committed_date: Date.yesterday,
authored_date: Date.yesterday,
parents: [],
message: 'Refactoring specs'
)
......
......@@ -3,7 +3,7 @@ RSpec::Matchers.define :be_valid_commit do
actual != nil
actual.id == ValidCommit::ID
actual.message == ValidCommit::MESSAGE
actual.author.name == ValidCommit::AUTHOR_FULL_NAME
actual.author_name == ValidCommit::AUTHOR_FULL_NAME
end
end
......
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