Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Styled wiki area. fixed commit feed feature

  • Loading branch information...
commit 14c97237246f01da60ad73d9efd2c08c45927f09 1 parent 501ca8e
@randx randx authored
View
5 app/views/wikis/history.html.haml
@@ -1,5 +1,6 @@
-%h3 Versions
-%table
+%h3.page_title Versions
+%br
+%table.admin-table
%thead
%tr
%th #
View
11 app/views/wikis/show.html.haml
@@ -5,15 +5,18 @@
= link_to history_project_wiki_path(@project, @wiki), :class => "btn small grouped" do
History
= link_to edit_project_wiki_path(@project, @wiki), :class => "btn small grouped" do
+ %i.icon-edit
Edit
-%hr
-.wiki_content
- = preserve do
- = markdown @wiki.content
+%br
+.file_holder
+ .file_content.wiki
+ = preserve do
+ = markdown @wiki.content
%p.time Last edited by #{@wiki.user.name}, #{time_ago_in_words @wiki.created_at} ago
- if can? current_user, :admin_wiki, @project
= link_to project_wiki_path(@project, @wiki), :confirm => "Are you sure you want to delete this page?", :method => :delete do
Delete this page
+%hr
.wiki_notes#notes= render "notes/notes", :tid => @wiki.id, :tt => "wiki"
View
4 features/step_definitions/project_commits_steps.rb
@@ -16,11 +16,11 @@
end
Then /^I see commits atom feed$/ do
- commit = @project.commit
+ commit = CommitDecorator.decorate(@project.commit)
page.response_headers['Content-Type'].should have_content("application/atom+xml")
page.body.should have_selector("title", :text => "Recent commits to #{@project.name}")
page.body.should have_selector("author email", :text => commit.author_email)
- page.body.should have_selector("entry summary", :text => commit.message)
+ page.body.should have_selector("entry summary", :text => commit.description)
end
Given /^I click on commit link$/ do
Please sign in to comment.
Something went wrong with that request. Please try again.