end
end
- def show
- result = CommitLoad.new(project, current_user, params).execute
-
- @commit = result[:commit]
-
- if @commit
- @suppress_diff = result[:suppress_diff]
- @note = result[:note]
- @line_notes = result[:line_notes]
- @notes_count = result[:notes_count]
- @comments_allowed = true
- else
- return git_not_found!
- end
-
- if result[:status] == :huge_commit
- render "huge_commit" and return
- end
- end
+ # def show
+ # result = CommitLoad.new(project, current_user, params).execute
+
+ # @commit = result[:commit]
+
+ # if @commit
+ # @suppress_diff = result[:suppress_diff]
+ # @note = result[:note]
+ # @line_notes = result[:line_notes]
+ # @notes_count = result[:notes_count]
+ # @comments_allowed = true
+ # else
+ # return git_not_found!
+ # end
+
+ # if result[:status] == :huge_commit
+ # render "huge_commit" and return
+ # end
+ # end
def compare
result = Commit.compare(project, params[:from], params[:to])
id
end
+ def new_record?
+ false
+ end
+
def persisted?
false
end
%li.commit
.browse_code_link_holder
%p
- %strong= link_to "Browse Code »", tree_project_ref_path(@project, commit.id), class: "right"
+ %strong= link_to "Browse Code »", tree_project_ref_path(@project, commit), class: "right"
%p
- = link_to commit.short_id(8), project_commit_path(@project, id: commit.id), class: "commit_short_id"
+ = link_to commit.short_id(8), project_commit_path(@project, commit), class: "commit_short_id"
%strong.commit-author-name= commit.author_name
%span.dash –
= image_tag gravatar_icon(commit.author_email), class: "avatar", width: 16
- = link_to_gfm truncate(commit.title, length: 50), project_commit_path(@project, id: commit.id), class: "row_title"
+ = link_to_gfm truncate(commit.title, length: 50), project_commit_path(@project, commit.id), class: "row_title"
%span.committed_ago
= time_ago_in_words(commit.committed_date)
ago
-
- commit = CommitDecorator.decorate(commit)
%li.commit
%p
- = link_to commit.short_id(8), project_commit_path(project, id: commit.id), class: "commit_short_id"
+ = link_to commit.short_id(8), project_commit_path(project, commit), class: "commit_short_id"
%span= commit.author_name
–
= image_tag gravatar_icon(commit.author_email), class: "avatar", width: 16
= commit.author_name
%td.blame_commit
- %code= link_to commit.short_id, project_commit_path(@project, id: commit.id)
- = link_to_gfm truncate(commit.title, length: 30), project_commit_path(@project, id: commit.id), class: "row_title" rescue "--broken encoding"
+ %code= link_to commit.short_id, project_commit_path(@project, commit)
+ = link_to_gfm truncate(commit.title, length: 30), project_commit_path(@project, commit), class: "row_title" rescue "--broken encoding"
%td.lines
= preserve do
%pre
- if branch.name == @project.root_ref
%span.label default
%td
- = link_to project_commit_path(@project, id: commit.id) do
+ = link_to project_commit_path(@project, commit) do
%code= commit.short_id
= image_tag gravatar_icon(commit.author_email), class: "", width: 16
def reference_commit(identifier)
if commit = @project.commit(identifier)
- link_to(identifier, project_commit_path(@project, id: commit.id), html_options.merge(title: CommitDecorator.new(commit).link_title, class: "gfm gfm-commit #{html_options[:class]}"))
+ link_to(identifier, project_commit_path(@project, commit), html_options.merge(title: CommitDecorator.new(commit).link_title, class: "gfm gfm-commit #{html_options[:class]}"))
end
end
end
end
it "should render title in commits#show" do
- visit project_commit_path(project, id: commit.id)
+ visit project_commit_path(project, commit)
page.should have_link("##{issue.id}")
end
it "should render description in commits#show" do
- visit project_commit_path(project, id: commit.id)
+ visit project_commit_path(project, commit)
page.should have_link("@#{fred.name}")
end
describe "for notes" do
it "should render in commits#show", js: true do
- visit project_commit_path(project, id: commit.id)
+ visit project_commit_path(project, commit)
fill_in "note_note", with: "see ##{issue.id}"
click_button "Add Comment"
end
end
+# project_commit GET /:project_id/commit/:id(.:format) commit#show {:id=>/[[:alnum:]]{6,40}/, :project_id=>/[^\/]+/}
+describe CommitController, "routing" do
+ it "to #show" do
+ get("/gitlabhq/commit/4246fb").should route_to('commit#show', project_id: 'gitlabhq', id: '4246fb')
+ get("/gitlabhq/commit/4246fbd13872934f72a8fd0d6fb1317b47b59cb5").should route_to('commit#show', project_id: 'gitlabhq', id: '4246fbd13872934f72a8fd0d6fb1317b47b59cb5')
+ end
+end
+
# compare_project_commits GET /:project_id/commits/compare(.:format) commits#compare
# patch_project_commit GET /:project_id/commits/:id/patch(.:format) commits#patch
# project_commits GET /:project_id/commits(.:format) commits#index
end
it_behaves_like "RESTful project resources" do
+ let(:actions) { [:index, :show] }
let(:controller) { 'commits' }
end
end