Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-09-27

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/assets/javascripts/boards/boards_bundle.js

@@ -102,7 +102,7 @@ $(() => {
       eventHub.$off('updateTokens', this.updateTokens);
     },
     mounted () {
-      this.filterManager = new FilteredSearchBoards(Store.filter, true);
+      this.filterManager = new FilteredSearchBoards(Store.filter, true, [(this.milestoneTitle ? 'milestone' : null)]);
       this.filterManager.setup();
 
       Store.disabled = this.disabled;

app/assets/stylesheets/pages/boards.scss

@@ -80,6 +80,11 @@
     .boards-list {
       height: calc(100vh - 50px);
     }
+
+    .issue-boards-sidebar {
+      height: 100%;
+      top: 0;
+    }
   }
 }
 

app/views/shared/boards/_switcher.html.haml

@@ -6,7 +6,7 @@
   ":current-board" => current_board_json,
   "milestone-path" => milestones_filter_path(milestone_filter_opts) }
   .dropdown
-    %button.dropdown-menu-toggle{ "@click" => "loadBoards",
+    %button.dropdown-menu-toggle{ "v-on:click" => "loadBoards",
       data: { toggle: "dropdown" } }
       {{ board.name }}
       = icon("chevron-down")
@@ -14,7 +14,7 @@
       .dropdown-title
         %button.dropdown-title-button.dropdown-menu-back{ type: "button",
           aria: { label: "Go back" },
-          "@click.stop.prevent" => "showPage('')",
+          "v-on:click.stop.prevent" => "showPage('')",
           "v-if" => "currentPage !== ''" }
           = icon("arrow-left")
         {{ title }}
@@ -45,23 +45,23 @@
               method: :delete do
               Delete
             %button.btn.btn-default.pull-right{ type: "button",
-              "@click.stop.prevent" => "showPage('')" }
+              "v-on:click.stop.prevent" => "showPage('')" }
               Cancel
       - if can?(current_user, :admin_board, parent)
         .dropdown-footer{ "v-if" => "currentPage === ''" }
           %ul.dropdown-footer-list
             - if parent.feature_available?(:multiple_issue_boards)
               %li
-                %a{ "href" => "#", "@click.stop.prevent" => "showPage('new')" }
+                %a{ "href" => "#", "v-on:click.stop.prevent" => "showPage('new')" }
                   Create new board
             %li
-              %a{ "href" => "#", "@click.stop.prevent" => "showPage('edit')" }
+              %a{ "href" => "#", "v-on:click.stop.prevent" => "showPage('edit')" }
                 Edit board name
             - if parent.issue_board_milestone_available?(current_user)
               %li
-                %a{ "href" => "#", "@click.stop.prevent" => "showPage('milestone')" }
+                %a{ "href" => "#", "v-on:click.stop.prevent" => "showPage('milestone')" }
                   Edit board milestone
             %li{ "v-if" => "showDelete" }
-              %a{ "href" => "#", "@click.stop.prevent" => "showPage('delete')" }
+              %a{ "href" => "#", "v-on:click.stop.prevent" => "showPage('delete')" }
                 %span.text-danger
                   Delete board

app/views/shared/boards/components/_form.html.haml

 .board-selector-page-two
-  %form{ "@submit.prevent" => "submit" }
+  %form{ "v-on:submit.prevent" => "submit" }
     .dropdown-content
       %input{ type: "hidden",
         id: "board-milestone",
@@ -16,7 +16,7 @@
           %label.label-light{ for: "board-milestone" }
             Board milestone
           %button.dropdown-menu-toggle.wide{ type: "button",
-            "@click.stop.prevent" => "loadMilestones($event)" }
+            "v-on:click.stop.prevent" => "loadMilestones($event)" }
             {{ milestoneToggleText }}
             = icon("chevron-down")
           .dropdown-menu.dropdown-menu-selectable{ "v-if" => "milestoneDropdownOpen",
@@ -26,13 +26,13 @@
                 %li{ "v-for" => "milestone in extraMilestones" }
                   %a{ href: "#",
                     ":class" => "{ 'is-active': milestone.id === board.milestone_id }",
-                    "@click.stop.prevent" => "selectMilestone(milestone)" }
+                    "v-on:click.stop.prevent" => "selectMilestone(milestone)" }
                     {{ milestone.title }}
                 %li.divider
                 %li{ "v-for" => "milestone in milestones" }
                   %a{ href: "#",
                     ":class" => "{ 'is-active': milestone.id === board.milestone_id }",
-                    "@click.stop.prevent" => "selectMilestone(milestone)" }
+                    "v-on:click.stop.prevent" => "selectMilestone(milestone)" }
                     {{ milestone.title }}
             = dropdown_loading
           %span
@@ -47,5 +47,5 @@
         "ref" => "'submit-btn'" }
         {{ buttonText }}
       %button.btn.btn-default.pull-right{ type: "button",
-        "@click.stop.prevent" => "cancel" }
+        "v-on:click.stop.prevent" => "cancel" }
         Cancel

lib/tasks/gettext.rake

@@ -4,7 +4,7 @@ namespace :gettext do
   # Customize list of translatable files
   # See: https://github.com/grosser/gettext_i18n_rails#customizing-list-of-translatable-files
   def files_to_translate
-    folders = %W(app lib config #{locale_path}).join(',')
+    folders = %W(ee app lib config #{locale_path}).join(',')
     exts = %w(rb erb haml slim rhtml js jsx vue handlebars hbs mustache).join(',')
 
     Dir.glob(

locale/gitlab.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-27 11:10+0100\n"
-"PO-Revision-Date: 2017-09-27 11:10+0100\n"
+"POT-Creation-Date: 2017-09-27 16:26+0200\n"
+"PO-Revision-Date: 2017-09-27 16:26+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -158,6 +158,60 @@ msgstr ""
 msgid "AutoDevOps|Learn more in the %{link_to_documentation}"
 msgstr ""
 
+msgid "Billing"
+msgstr ""
+
+msgid "BillingPlans|%{group_name} is currently on the %{plan_link} plan."
+msgstr ""
+
+msgid "BillingPlans|Automatic downgrade and upgrade to some plans is currently not available."
+msgstr ""
+
+msgid "BillingPlans|Current plan"
+msgstr ""
+
+msgid "BillingPlans|Customer Support"
+msgstr ""
+
+msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}."
+msgstr ""
+
+msgid "BillingPlans|Manage plan"
+msgstr ""
+
+msgid "BillingPlans|Please contact %{customer_support_link} in that case."
+msgstr ""
+
+msgid "BillingPlans|See all %{plan_name} features"
+msgstr ""
+
+msgid "BillingPlans|This group uses the plan associated with its parent group."
+msgstr ""
+
+msgid "BillingPlans|To manage the plan for this group, visit the billing section of %{parent_billing_page_link}."
+msgstr ""
+
+msgid "BillingPlans|Upgrade"
+msgstr ""
+
+msgid "BillingPlans|You are currently on the %{plan_link} plan."
+msgstr ""
+
+msgid "BillingPlans|frequently asked questions"
+msgstr ""
+
+msgid "BillingPlans|monthly"
+msgstr ""
+
+msgid "BillingPlans|paid annually at %{price_per_year}"
+msgstr ""
+
+msgid "BillingPlans|per user"
+msgstr ""
+
+msgid "Billinglans|Downgrade"
+msgstr ""
+
 msgid "Board"
 msgstr ""
 
@@ -229,6 +283,9 @@ msgstr ""
 msgid "Branches|Sort by"
 msgstr ""
 
+msgid "Branches|The branch could not be updated automatically because it has diverged from its upstream counterpart."
+msgstr ""
+
 msgid "Branches|The default branch cannot be deleted"
 msgstr ""
 
@@ -241,9 +298,15 @@ msgstr ""
 msgid "Branches|To confirm, type %{branch_name_confirmation}:"
 msgstr ""
 
+msgid "Branches|To discard the local changes and overwrite the branch with the upstream version, delete it here and choose 'Update Now' above."
+msgstr ""
+
 msgid "Branches|You’re about to permanently delete the protected branch %{branch_name}."
 msgstr ""
 
+msgid "Branches|diverged from upstream"
+msgstr ""
+
 msgid "Branches|merged"
 msgstr ""
 
@@ -402,6 +465,9 @@ msgstr ""
 msgid "Contributors"
 msgstr ""
 
+msgid "Copy SSH public key to clipboard"
+msgstr ""
+
 msgid "Copy URL to clipboard"
 msgstr ""
 
@@ -619,6 +685,9 @@ msgstr ""
 msgid "GPG Keys"
 msgstr ""
 
+msgid "Geo Nodes"
+msgstr ""
+
 msgid "Git storage health information has been reset"
 msgstr ""
 
@@ -738,11 +807,17 @@ msgstr ""
 msgid "Leave project"
 msgstr ""
 
+msgid "License"
+msgstr ""
+
 msgid "Limited to showing %d event at most"
 msgid_plural "Limited to showing %d events at most"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "Locked Files"
+msgstr ""
+
 msgid "Median"
 msgstr ""
 
@@ -913,6 +988,9 @@ msgstr ""
 msgid "Pipeline Schedules"
 msgstr ""
 
+msgid "Pipeline quota"
+msgstr ""
+
 msgid "PipelineCharts|Failed:"
 msgstr ""
 
@@ -1078,6 +1156,9 @@ msgstr ""
 msgid "ProjectsDropdown|This feature requires browser localStorage support"
 msgstr ""
 
+msgid "Push Rules"
+msgstr ""
+
 msgid "Push events"
 msgstr ""
 
@@ -1093,6 +1174,9 @@ msgstr ""
 msgid "RefSwitcher|Tags"
 msgstr ""
 
+msgid "Registry"
+msgstr ""
+
 msgid "Related Commits"
 msgstr ""
 
@@ -1242,6 +1326,9 @@ msgstr ""
 msgid "SortOptions|Least popular"
 msgstr ""
 
+msgid "SortOptions|Less weight"
+msgstr ""
+
 msgid "SortOptions|Milestone"
 msgstr ""
 
@@ -1251,6 +1338,9 @@ msgstr ""
 msgid "SortOptions|Milestone due soon"
 msgstr ""
 
+msgid "SortOptions|More weight"
+msgstr ""
+
 msgid "SortOptions|Most popular"
 msgstr ""
 
@@ -1290,6 +1380,9 @@ msgstr ""
 msgid "SortOptions|Start soon"
 msgstr ""
 
+msgid "SortOptions|Weight"
+msgstr ""
+
 msgid "Source code"
 msgstr ""
 
@@ -1644,6 +1737,9 @@ msgstr ""
 msgid "Your projects"
 msgstr ""
 
+msgid "commit"
+msgstr ""
+
 msgid "day"
 msgid_plural "days"
 msgstr[0] ""