Merge branch 'master' into feature/gb/manual-actions-protected-branches-permissions

* master: (274 commits)
  Update VERSION to 9.2.0-pre
  Update CHANGELOG.md for 9.1.0
  Update Auto Deploy documentation
  Disable import URL field in New project form since it's hidden by default
  Remove reference to burndown charts since they don't exist for ce.
  Use master_password for Sentinel
  Refactor Discussions docs
  Start versioning cached markdown fields
  Refactor add_users method for project and group
  Improved the spec Now correctly tests against different forms
  Refactor environments components into vue files - part 3
  Adding animation for all dropdown
  fix placeholder visibility
  submodule_links: handle urls that don't end with .git
  Add help regarding vue resource and where to include it
  Append .json to ajax endpoint to prevent browser to display raw json
  Fixed the preview keyboard shortcut focusing wrong tab
  Fix broken link
  Added new discussions docs
  Started on resolvable discussions docs
  ...

7 files changed, 124 insertions, 12 deletions

diff --git a/spec/features/projects/blobs/user_create_spec.rb b/spec/features/projects/blobs/user_create_spec.rb
index fa1a753afcb..6ea149956fe 100644
--- a/spec/features/projects/blobs/user_create_spec.rb
+++ b/spec/features/projects/blobs/user_create_spec.rb
@@ -77,7 +77,7 @@ feature 'New blob creation', feature: true, js: true do
         project,
         user,
         start_branch: 'master',
-        target_branch: 'master',
+        branch_name: 'master',
         commit_message: 'Create file',
         file_path: 'feature.rb',
         file_content: content
@@ -87,7 +87,7 @@ feature 'New blob creation', feature: true, js: true do
     end
 
     scenario 'shows error message' do
-      expect(page).to have_content('Your changes could not be committed because a file with the same name already exists')
+      expect(page).to have_content('A file with this name already exists')
       expect(page).to have_content('New file')
       expect(page).to have_content('NextFeature')
     end
diff --git a/spec/features/projects/files/creating_a_file_spec.rb b/spec/features/projects/files/creating_a_file_spec.rb
index 5d7bd3dc4ce..de6905f2b58 100644
--- a/spec/features/projects/files/creating_a_file_spec.rb
+++ b/spec/features/projects/files/creating_a_file_spec.rb
@@ -29,16 +29,16 @@ feature 'User wants to create a file', feature: true do
 
   scenario 'directory name contains Chinese characters' do
     submit_new_file(file_name: '中文/测试.md')
-    expect(page).to have_content 'The file has been successfully created.'
+    expect(page).to have_content 'The file has been successfully created'
   end
 
   scenario 'file name contains invalid characters' do
     submit_new_file(file_name: '\\')
-    expect(page).to have_content 'Your changes could not be committed, because the file name can contain only'
+    expect(page).to have_content 'Path can contain only'
   end
 
   scenario 'file name contains directory traversal' do
     submit_new_file(file_name: '../README.md')
-    expect(page).to have_content 'Your changes could not be committed, because the file name cannot include directory traversal.'
+    expect(page).to have_content 'Path cannot include directory traversal'
   end
 end
diff --git a/spec/features/projects/files/editing_a_file_spec.rb b/spec/features/projects/files/editing_a_file_spec.rb
index 3e544316f28..4da34108b46 100644
--- a/spec/features/projects/files/editing_a_file_spec.rb
+++ b/spec/features/projects/files/editing_a_file_spec.rb
@@ -8,7 +8,7 @@ feature 'User wants to edit a file', feature: true do
   let(:commit_params) do
     {
       start_branch: project.default_branch,
-      target_branch: project.default_branch,
+      branch_name: project.default_branch,
       commit_message: "Committing First Update",
       file_path: ".gitignore",
       file_content: "First Update",
diff --git a/spec/features/projects/issuable_templates_spec.rb b/spec/features/projects/issuable_templates_spec.rb
index 62d0aedda48..6cdca0f114b 100644
--- a/spec/features/projects/issuable_templates_spec.rb
+++ b/spec/features/projects/issuable_templates_spec.rb
@@ -163,12 +163,14 @@ feature 'issuable templates', feature: true, js: true do
   end
 
   def select_template(name)
-    first('.js-issuable-selector').click
-    first('.js-issuable-selector-wrap .dropdown-content a', text: name).click
+    find('.js-issuable-selector').click
+
+    find('.js-issuable-selector-wrap .dropdown-content a', text: name, match: :first).click
   end
 
   def select_option(name)
-    first('.js-issuable-selector').click
-    first('.js-issuable-selector-wrap .dropdown-footer-list a', text: name).click
+    find('.js-issuable-selector').click
+
+    find('.js-issuable-selector-wrap .dropdown-footer-list a', text: name, match: :first).click
   end
 end
diff --git a/spec/features/projects/members/list_spec.rb b/spec/features/projects/members/list_spec.rb
new file mode 100644
index 00000000000..deea34214fb
--- /dev/null
+++ b/spec/features/projects/members/list_spec.rb
@@ -0,0 +1,90 @@
+require 'spec_helper'
+
+feature 'Project members list', feature: true do
+  include Select2Helper
+
+  let(:user1) { create(:user, name: 'John Doe') }
+  let(:user2) { create(:user, name: 'Mary Jane') }
+  let(:group) { create(:group) }
+  let(:project) { create(:project, namespace: group) }
+
+  background do
+    login_as(user1)
+    group.add_owner(user1)
+  end
+
+  scenario 'show members from project and group' do
+    project.add_developer(user2)
+
+    visit_members_page
+
+    expect(first_row.text).to include(user1.name)
+    expect(second_row.text).to include(user2.name)
+  end
+
+  scenario 'show user once if member of both group and project' do
+    project.add_developer(user1)
+
+    visit_members_page
+
+    expect(first_row.text).to include(user1.name)
+    expect(second_row).to be_blank
+  end
+
+  scenario 'update user acess level', :js do
+    project.add_developer(user2)
+
+    visit_members_page
+
+    page.within(second_row) do
+      click_button('Developer')
+      click_link('Reporter')
+
+      expect(page).to have_button('Reporter')
+    end
+  end
+
+  scenario 'add user to project', :js do
+    visit_members_page
+
+    add_user(user2.id, 'Reporter')
+
+    page.within(second_row) do
+      expect(page).to have_content(user2.name)
+      expect(page).to have_button('Reporter')
+    end
+  end
+
+  scenario 'invite user to project', :js do
+    visit_members_page
+
+    add_user('test@example.com', 'Reporter')
+
+    page.within(second_row) do
+      expect(page).to have_content('test@example.com')
+      expect(page).to have_content('Invited')
+      expect(page).to have_button('Reporter')
+    end
+  end
+
+  def first_row
+    page.all('ul.content-list > li')[0]
+  end
+
+  def second_row
+    page.all('ul.content-list > li')[1]
+  end
+
+  def add_user(id, role)
+    page.within ".users-project-form" do
+      select2(id, from: "#user_ids", multiple: true)
+      select(role, from: "access_level")
+    end
+
+    click_button "Add to project"
+  end
+
+  def visit_members_page
+    visit namespace_project_settings_members_path(project.namespace, project)
+  end
+end
diff --git a/spec/features/projects/view_on_env_spec.rb b/spec/features/projects/view_on_env_spec.rb
index ce5c5f21167..34c6a10950f 100644
--- a/spec/features/projects/view_on_env_spec.rb
+++ b/spec/features/projects/view_on_env_spec.rb
@@ -25,7 +25,7 @@ describe 'View on environment', js: true do
         project,
         user,
         start_branch: branch_name,
-        target_branch: branch_name,
+        branch_name: branch_name,
         commit_message: "Add .gitlab/route-map.yml",
         file_path: '.gitlab/route-map.yml',
         file_content: route_map
@@ -36,7 +36,7 @@ describe 'View on environment', js: true do
         project,
         user,
         start_branch: branch_name,
-        target_branch: branch_name,
+        branch_name: branch_name,
         commit_message: "Update feature",
         file_path: file_path,
         file_content: "# Noop"
diff --git a/spec/features/projects/wiki/shortcuts_spec.rb b/spec/features/projects/wiki/shortcuts_spec.rb
new file mode 100644
index 00000000000..c1f6b0cce3b
--- /dev/null
+++ b/spec/features/projects/wiki/shortcuts_spec.rb
@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+feature 'Wiki shortcuts', :feature, :js do
+  let(:user) { create(:user) }
+  let(:project) { create(:empty_project, namespace: user.namespace) }
+  let(:wiki_page) do
+    WikiPages::CreateService.new(project, user, title: 'home', content: 'Home page').execute
+  end
+
+  before do
+    login_as(user)
+    visit namespace_project_wiki_path(project.namespace, project, wiki_page)
+  end
+
+  scenario 'Visit edit wiki page using "e" keyboard shortcut' do
+    find('body').native.send_key('e')
+
+    expect(find('.wiki-page-title')).to have_content('Edit Page')
+  end
+end