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

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

features/steps/project/project.rb

@@ -86,14 +86,16 @@ class Spinach::Features::Project < Spinach::FeatureSteps
   end
   step 'I should see project "Forum" README' do
-    expect(page).to have_link 'README.md'
+    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'
+    page.within('#README') do
       expect(page).to have_content 'testme'
     end
+  end
   step 'I add project tags' do
     fill_in 'Tags', with: 'tag1, tag2'