Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
14c97237
Commit
14c97237
authored
Jul 25, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Styled wiki area. fixed commit feed feature
parent
501ca8e6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
8 deletions
+12
-8
app/views/wikis/history.html.haml
app/views/wikis/history.html.haml
+3
-2
app/views/wikis/show.html.haml
app/views/wikis/show.html.haml
+7
-4
features/step_definitions/project_commits_steps.rb
features/step_definitions/project_commits_steps.rb
+2
-2
No files found.
app/views/wikis/history.html.haml
View file @
14c97237
%h3
Versions
%table
%h3
.page_title
Versions
%br
%table
.admin-table
%thead
%tr
%th
#
...
...
app/views/wikis/show.html.haml
View file @
14c97237
...
...
@@ -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"
features/step_definitions/project_commits_steps.rb
View file @
14c97237
...
...
@@ -16,11 +16,11 @@ Given /^I click atom feed link$/ do
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment