diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-07-09 16:00:17 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-07-09 16:00:17 +0300 |
| commit | 51ceae672426610e7eee075cee0f95f5e07eab40 (patch) | |
| tree | d05689114a6abdf4f6f3027d636739128b1ebb6f | |
| parent | 5309dad4599310a50883366c9cdf866465a89f11 (diff) | |
| parent | d8dfbc511830aff5e3e3f01f94f91f292b606f44 (diff) | |
Merge branch 'edit-readme' into 'master'
Show edit readme from project home page
I added pencil icon which redirect you to edit README page (web editor). In this case people can make changes to README easily without going to Files tab, searching for README and pressing edit button here
cc @job @darby
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !1892
| -rw-r--r-- | app/views/projects/show.html.haml | 9 | ||||
| -rw-r--r-- | features/steps/project/project.rb | 10 |
2 files changed, 11 insertions, 8 deletions
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index d9cff805575..d642690153f 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -44,10 +44,11 @@ - if readme = @repository.readme %article.readme-holder#README .clearfix - %small.pull-right - = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)), class: 'light' do - %i.fa.fa-file - = readme.name + .pull-right + + - if can?(current_user, :push_code, @project) + = link_to namespace_project_edit_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)), class: 'light' do + %i.fa.fa-pencil .wiki = render_readme(readme) - else diff --git a/features/steps/project/project.rb b/features/steps/project/project.rb index b4a0ba1e27f..e8f9a80737f 100644 --- a/features/steps/project/project.rb +++ b/features/steps/project/project.rb @@ -86,13 +86,15 @@ class Spinach::Features::Project < Spinach::FeatureSteps end step 'I should see project "Forum" README' do - expect(page).to have_link 'README.md' - expect(page).to have_content 'Sample repo for testing gitlab features' + page.within('#README') do + expect(page).to have_content 'Sample repo for testing gitlab features' + end end step 'I should see project "Shop" README' do - expect(page).to have_link 'README.md' - expect(page).to have_content 'testme' + page.within('#README') do + expect(page).to have_content 'testme' + end end step 'I add project tags' do |