deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Styled wiki area. fixed commit feed feature

Browse source
This commit is contained in:
randx 2012-07-25 22:08:47 +03:00
parent 501ca8e6e8
commit 14c9723724
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/views/wikis/history.html.haml
View file

@ -1,5 +1,6 @@
%h3 Versions %h3.page_title Versions
%table %br
%table.admin-table
%thead %thead
%tr %tr
%th # %th #

7
app/views/wikis/show.html.haml
View file

@ -5,9 +5,11 @@
= link_to history_project_wiki_path(@project, @wiki), :class => "btn small grouped" do = link_to history_project_wiki_path(@project, @wiki), :class => "btn small grouped" do
History History
= link_to edit_project_wiki_path(@project, @wiki), :class => "btn small grouped" do = link_to edit_project_wiki_path(@project, @wiki), :class => "btn small grouped" do
%i.icon-edit
Edit Edit
%hr %br
.wiki_content .file_holder
.file_content.wiki
= preserve do = preserve do
= markdown @wiki.content = markdown @wiki.content
@ -16,4 +18,5 @@
= link_to project_wiki_path(@project, @wiki), :confirm => "Are you sure you want to delete this page?", :method => :delete do = link_to project_wiki_path(@project, @wiki), :confirm => "Are you sure you want to delete this page?", :method => :delete do
Delete this page Delete this page
%hr
.wiki_notes#notes= render "notes/notes", :tid => @wiki.id, :tt => "wiki" .wiki_notes#notes= render "notes/notes", :tid => @wiki.id, :tt => "wiki"

4
features/step_definitions/project_commits_steps.rb
View file

@ -16,11 +16,11 @@ Given /^I click atom feed link$/ do
end end
Then /^I see commits atom feed$/ do 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.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("title", :text => "Recent commits to #{@project.name}")
page.body.should have_selector("author email", :text => commit.author_email) 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 end
Given /^I click on commit link$/ do Given /^I click on commit link$/ do