Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-06

# Conflicts:
#	app/assets/javascripts/mr_notes/stores/index.js
#	app/assets/javascripts/notes/components/noteable_note.vue
#	app/services/merge_requests/refresh_service.rb
#	locale/gitlab.pot

[ci skip]

GITALY_SERVER_VERSION

-0.124.0
+0.125.0

app/assets/javascripts/mr_notes/stores/index.js

@@ -13,7 +13,10 @@ export const createStore = () =>
       page: mrPageModule,
       notes: notesModule(),
       diffs: diffsModule(),
+<<<<<<< HEAD
       batchComments: batchCommentsModule(),
+=======
+>>>>>>> upstream/master
     },
   });
 

app/assets/javascripts/notes/components/noteable_note.vue

@@ -116,9 +116,12 @@ export default {
         noteText,
         callback: () => this.updateSuccess(),
       });
+<<<<<<< HEAD
 
       if (this.note.isDraft) return;
 
+=======
+>>>>>>> upstream/master
       const data = {
         endpoint: this.note.path,
         note: {

app/assets/javascripts/vue_shared/components/markdown/header.vue

@@ -18,6 +18,16 @@
         required: true,
       },
     },
+    computed: {
+      mdTable() {
+        return [
+          '| header | header |',
+          '| ------ | ------ |',
+          '| cell | cell |',
+          '| cell | cell |',
+        ].join('\n');
+      },
+    },
     mounted() {
       $(document).on('markdown-preview:show.vue', this.previewMarkdownTab);
       $(document).on('markdown-preview:hide.vue', this.writeMarkdownTab);
@@ -129,6 +139,12 @@
           button-title="Add a task list"
           icon="task-done"
         />
+        <toolbar-button
+          :tag="mdTable"
+          :prepend="true"
+          :button-title="__('Add a table')"
+          icon="table"
+        />
         <button
           v-tooltip
           aria-label="Go full screen"

app/services/merge_requests/refresh_service.rb

@@ -2,12 +2,19 @@
 
 module MergeRequests
   class RefreshService < MergeRequests::BaseService
+<<<<<<< HEAD
     prepend EE::MergeRequests::RefreshService
 
     def execute(oldrev, newrev, ref)
       push = Gitlab::Git::Push.new(@project, oldrev, newrev, ref)
       return true unless push.branch_push?
 
+=======
+    def execute(oldrev, newrev, ref)
+      push = Gitlab::Git::Push.new(@project, oldrev, newrev, ref)
+      return true unless push.branch_push?
+
+>>>>>>> upstream/master
       refresh_merge_requests!(push)
     end
 

app/views/groups/settings/_advanced.html.haml

@@ -12,8 +12,8 @@
         .group-root-path.input-group-prepend.has-tooltip{ title: group_path(@group), :'data-placement' => 'bottom' }
           .input-group-text
             %span>= root_url
-            - if parent
-              %strong= parent.full_path + '/'
+            - if @group.parent
+              %strong= @group.parent.full_path + '/'
         = f.hidden_field :parent_id
         = f.text_field :path, placeholder: 'open-source', class: 'form-control',
           autofocus: local_assigns[:autofocus] || false, required: true,

app/views/projects/_md_preview.html.haml

@@ -26,6 +26,8 @@
         = markdown_toolbar_button({ icon: "list-bulleted", data: { "md-tag" => "* ", "md-prepend" => true }, title: s_("MarkdownToolbar|Add a bullet list") })
         = markdown_toolbar_button({ icon: "list-numbered", data: { "md-tag" => "1. ", "md-prepend" => true }, title: s_("MarkdownToolbar|Add a numbered list") })
         = markdown_toolbar_button({ icon: "task-done", data: { "md-tag" => "* [ ] ", "md-prepend" => true }, title: s_("MarkdownToolbar|Add a task list") })
+        = markdown_toolbar_button({ icon: "table", data: { "md-tag" => "| header 1 | header 2 |\n| -------- | -------- |\n| cell 1   | cell 2   |\n| cell 3   | cell 4   |", "md-prepend" => true }, title: s_("MarkdownToolbar|Add a table") })
+        = markdown_toolbar_button({ icon: "table", data: { "md-tag" => "| header | header |\n| ------ | ------ |\n| cell | cell |\n| cell | cell |", "md-prepend" => true }, title: _('Add a table') })
         %button.toolbar-btn.toolbar-fullscreen-btn.js-zen-enter.has-tooltip{ type: "button", tabindex: -1, "aria-label": "Go full screen", title: s_("MarkdownToolbar|Go full screen"), data: { container: "body" } }
           = sprite_icon("screen-full")
 

changelogs/unreleased/52242-ui-ux-bug-in-change-group-path.yml

+---
+title: Fix incorrect parent path on group settings page
+merge_request: 22142
+author:
+type: fixed

changelogs/unreleased/add-button-to-insert-table-in-markdown.yml

+---
+title: Add markdown header toolbar button to insert table
+merge_request: 18480
+author: George Tsiolis
+type: added

locale/gitlab.pot

@@ -404,10 +404,14 @@ msgstr ""
 msgid "Add Readme"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Add additional text to appear in all email communications. %{character_limit} character limit"
 msgstr ""
 
 msgid "Add comment now"
+=======
+msgid "Add a table"
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "Add license"
@@ -4797,6 +4801,9 @@ msgstr ""
 msgid "MarkdownToolbar|Add a numbered list"
 msgstr ""
 
+msgid "MarkdownToolbar|Add a table"
+msgstr ""
+
 msgid "MarkdownToolbar|Add a task list"
 msgstr ""
 

spec/features/groups/group_settings_spec.rb

@@ -98,6 +98,22 @@ describe 'Edit group settings' do
     end
   end
 
+  describe 'edit group path' do
+    it 'has a root URL label for top-level group' do
+      visit edit_group_path(group)
+
+      expect(find(:css, '.group-root-path').text).to eq(root_url)
+    end
+
+    it 'has a parent group URL label for a subgroup group', :postgresql do
+      subgroup = create(:group, parent: group)
+
+      visit edit_group_path(subgroup)
+
+      expect(find(:css, '.group-root-path').text).to eq(group_url(subgroup.parent) + '/')
+    end
+  end
+
   def update_path(new_group_path)
     visit edit_group_path(group)
 

spec/javascripts/vue_shared/components/markdown/header_spec.js

@@ -17,8 +17,13 @@ describe('Markdown field header component', () => {
     Vue.nextTick(done);
   });
 
-  it('renders markdown buttons', () => {
-    expect(vm.$el.querySelectorAll('.js-md').length).toBe(8);
+  it('renders markdown header buttons', () => {
+    const buttons = ['Add bold text', 'Add italic text', 'Insert a quote', 'Insert code', 'Add a link', 'Add a bullet list', 'Add a numbered list', 'Add a task list', 'Add a table', 'Go full screen'];
+    const elements = vm.$el.querySelectorAll('.toolbar-btn');
+
+    elements.forEach((buttonEl, index) => {
+      expect(buttonEl.getAttribute('data-original-title')).toBe(buttons[index]);
+    });
   });
 
   it('renders `write` link as active when previewMarkdown is false', () => {
@@ -69,4 +74,8 @@ describe('Markdown field header component', () => {
       done();
     });
   });
+
+  it('renders markdown table template', () => {
+    expect(vm.mdTable).toEqual('| header | header |\n| ------ | ------ |\n| cell | cell |\n| cell | cell |');
+  });
 });