Commit 88d3e97e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'readme_tab' into 'master'

Add Readme tab to project show page

Fixes #1533

See merge request !1140
parents 76aca721 ae88a9bf
...@@ -6,6 +6,7 @@ v 7.4.0 ...@@ -6,6 +6,7 @@ v 7.4.0
- Default branch is protected by default - Default branch is protected by default
- Increase unicorn timeout to 60 seconds - Increase unicorn timeout to 60 seconds
- Sort search autocomplete projects by stars count so most popular go first - Sort search autocomplete projects by stars count so most popular go first
- Add README to tab on project show page
- Do not delete tmp/repositories itself during clean-up, only its contents - Do not delete tmp/repositories itself during clean-up, only its contents
- Support for backup uploads to remote storage - Support for backup uploads to remote storage
- Prevent notes polling when there are not notes - Prevent notes polling when there are not notes
......
...@@ -51,3 +51,12 @@ $ -> ...@@ -51,3 +51,12 @@ $ ->
$(@).toggleClass('on').find('.count').html(data.star_count) $(@).toggleClass('on').find('.count').html(data.star_count)
.on 'ajax:error', (e, xhr, status, error) -> .on 'ajax:error', (e, xhr, status, error) ->
new Flash('Star toggle failed. Try again later.', 'alert') new Flash('Star toggle failed. Try again later.', 'alert')
$("a[data-toggle='tab']").on "shown.bs.tab", (e) ->
$.cookie "default_view", $(e.target).attr("href")
defaultView = $.cookie("default_view")
if defaultView
$("a[href=" + defaultView + "]").tab "show"
else
$("a[data-toggle='tab']:first").tab "show"
= render "home_panel" = render "home_panel"
- readme = @repository.readme
%ul.nav.nav-tabs %ul.nav.nav-tabs
%li.active %li.active
= link_to project_path(@project) do = link_to '#tab-activity', 'data-toggle' => 'tab' do
Activity Activity
- if readme
%li
= link_to '#tab-readme', 'data-toggle' => 'tab' do
Readme
.project-home-links .project-home-links
- unless @project.empty_repo? - unless @project.empty_repo?
= link_to pluralize(number_with_delimiter(@repository.commit_count), 'commit'), project_commits_path(@project, @ref || @repository.root_ref) = link_to pluralize(number_with_delimiter(@repository.commit_count), 'commit'), project_commits_path(@project, @ref || @repository.root_ref)
...@@ -11,7 +16,9 @@ ...@@ -11,7 +16,9 @@
= link_to pluralize(number_with_delimiter(@repository.tag_names.count), 'tag'), project_tags_path(@project) = link_to pluralize(number_with_delimiter(@repository.tag_names.count), 'tag'), project_tags_path(@project)
%span.light.prepend-left-20= repository_size %span.light.prepend-left-20= repository_size
.row .tab-content
.tab-pane.active#tab-activity
.row
%section.col-md-9 %section.col-md-9
= render "events/event_last_push", event: @last_push = render "events/event_last_push", event: @last_push
= render 'shared/event_filter' = render 'shared/event_filter'
...@@ -37,11 +44,6 @@ ...@@ -37,11 +44,6 @@
= link_to project_compare_index_path(@project, from: @repository.root_ref, to: @ref || @repository.root_ref), class: 'btn btn-block' do = link_to project_compare_index_path(@project, from: @repository.root_ref, to: @ref || @repository.root_ref), class: 'btn btn-block' do
Compare code Compare code
- if @repository.readme
- readme = @repository.readme
= link_to project_blob_path(@project, tree_join(@repository.root_ref, readme.name)), class: 'btn btn-block' do
= readme.name
- if @repository.version - if @repository.version
- version = @repository.version - version = @repository.version
= link_to project_blob_path(@project, tree_join(@repository.root_ref, version.name)), class: 'btn btn-block' do = link_to project_blob_path(@project, tree_join(@repository.root_ref, version.name)), class: 'btn btn-block' do
...@@ -65,3 +67,14 @@ ...@@ -65,3 +67,14 @@
%hr %hr
= link_to @project.gitlab_ci_service.builds_path do = link_to @project.gitlab_ci_service.builds_path do
= image_tag @project.gitlab_ci_service.status_img_path, alt: "build status" = image_tag @project.gitlab_ci_service.status_img_path, alt: "build status"
- if readme
.tab-pane#tab-readme
%article.readme-holder#README
= link_to project_blob_path(@project, tree_join(@repository.root_ref, readme.name)) do
%h4.readme-file-title
%i.icon-file
= readme.name
.wiki
= render_readme(readme)
...@@ -27,7 +27,6 @@ Feature: Project Feature ...@@ -27,7 +27,6 @@ Feature: Project Feature
Scenario: I should see project readme and version Scenario: I should see project readme and version
When I visit project "Shop" page When I visit project "Shop" page
Then I should see project "Shop" README link
And I should see project "Shop" version And I should see project "Shop" version
Scenario: I should change project default branch Scenario: I should change project default branch
...@@ -35,3 +34,11 @@ Feature: Project Feature ...@@ -35,3 +34,11 @@ Feature: Project Feature
And change project default branch And change project default branch
And I save project And I save project
Then I should see project default branch changed Then I should see project default branch changed
@javascript
Scenario: I should have default tab per my preference
And I own project "Forum"
When I select project "Forum" README tab
Then I should see project "Forum" README
And I visit project "Shop" page
Then I should see project "Shop" README
...@@ -25,12 +25,6 @@ class Spinach::Features::ProjectFeature < Spinach::FeatureSteps ...@@ -25,12 +25,6 @@ class Spinach::Features::ProjectFeature < Spinach::FeatureSteps
project.path.should == "new-path" project.path.should == "new-path"
end end
step 'I should see project "Shop" README link' do
within '.project-side' do
page.should have_content "README.md"
end
end
step 'I should see project "Shop" version' do step 'I should see project "Shop" version' do
within '.project-side' do within '.project-side' do
page.should have_content "Version: 6.7.0.pre" page.should have_content "Version: 6.7.0.pre"
...@@ -45,4 +39,18 @@ class Spinach::Features::ProjectFeature < Spinach::FeatureSteps ...@@ -45,4 +39,18 @@ class Spinach::Features::ProjectFeature < Spinach::FeatureSteps
step 'I should see project default branch changed' do step 'I should see project default branch changed' do
find(:css, 'select#project_default_branch').value.should == 'fix' find(:css, 'select#project_default_branch').value.should == 'fix'
end end
step 'I select project "Forum" README tab' do
click_link 'Readme'
end
step 'I should see project "Forum" README' do
page.should have_link "README.md"
page.should have_content "Sample repo for testing gitlab features"
end
step 'I should see project "Shop" README' do
page.should have_link "README.md"
page.should have_content "testme"
end
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