Merge remote-tracking branch 'origin/release/11.0' into dev

app/views/projects/index.html.erb

@@ -32,7 +32,7 @@ See docs/COPYRIGHT.rdoc for more details.
 
 <% html_title(t(:label_project_plural)) -%>
 
-<%= toolbar title: t(:label_project_plural) do %>
+<%= toolbar title: t(:label_project_plural), html: { class: '-with-dropdown' } do %>
   <% if User.current.allowed_to?(:add_project, nil, global: true) %>
     <li class="toolbar-item">
       <%= link_to new_project_path,
@@ -64,6 +64,18 @@ See docs/COPYRIGHT.rdoc for more details.
       <%= op_icon("button--icon icon-external-link") %>
     <% end %>
   </li>
+  <% if current_user.admin? %>
+  <li class="toolbar-item drop-down">
+    <a href="#" aria-haspopup="true" title="<%= t(:label_more) %>" class="button">
+      <%= op_icon('button--icon icon-show-more') %>
+    </a>
+    <ul style="display:none;" class="menu-drop-down-container">
+      <li>
+        <%= link_to t('projects.index.edit_columns'), projects_settings_path, target: '_blank', class: 'icon-context icon-settings3'  %>
+      </li>
+    </ul>
+  </li>
+  <% end %>
 <% end %>
 
 <%= render partial: 'projects/filters/form', locals: { query: @query } %>

config/locales/en.yml

@@ -229,6 +229,7 @@ en:
       completed: "Deletion of project %{name} completed"
       completed_text: "The request to delete project '%{name}' has been completed."
     index:
+      edit_columns: 'Edit columns'
       open_as_gantt: 'Open as Gantt view'
       open_as_gantt_title: "Use this button to generate a Gantt view that filters work packages for the projects visible on this page."
       open_as_gantt_title_admin: "You can modify the view settings (such as selected work package types) in the administration under project settings."

modules/documents/spec/features/attachment_upload_spec.rb

@@ -52,9 +52,7 @@ describe 'Upload attachment to documents', js: true do
     it 'can upload an image' do
       visit new_project_document_path(project)
 
-      # Give the page time to initialize
-      sleep(0.3)
-
+      expect(page).to have_selector('#new_document', wait: 10)
       select(category.name, from: 'Category')
       fill_in "Title", with: 'New documentation'
 

spec/support/components/wysiwyg/wysiwyg_editor.rb

@@ -10,11 +10,11 @@ module Components
     end
 
     def container
-      page.find("#{context_selector} .op-ckeditor--wrapper")
+      page.find("#{context_selector} .op-ckeditor--wrapper", wait: 10)
     end
 
     def editor_element
-      page.find "#{context_selector} #{input_selector}"
+      page.find("#{context_selector} #{input_selector}", wait: 10)
     end
 
     def in_editor

spec/support/puffing_billy_proxy.rb

@@ -40,6 +40,21 @@ require 'billy/capybara/rspec'
 
 require 'table_print' # Add this dependency to your gemfile
 
+
+##
+# Patch `puffing-billy`'s proxy so that it doesn't try to stop
+# eventmachine's reactor if it's not running.
+# https://github.com/oesmith/puffing-billy/issues/253
+module BillyProxyPatch
+  def stop
+    return unless EM.reactor_running?
+
+    super
+  end
+end
+
+::Billy::Proxy.prepend(BillyProxyPatch)
+
 ##
 # To debug stubbed and proxied connections
 # uncomment this line