From 64f6b6bcad6d25fb9c1f191d8ba65869a73a9430 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 May 2019 12:08:49 -0400
Subject: [PATCH 01/42] Bump capybara from 3.18.0 to 3.19.0 (#5692)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.18.0 to 3.19.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.18.0...3.19.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 52bd2d1c6ac..f59fb4fbd33 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -68,7 +68,7 @@ GEM
     buftok (0.2.0)
     builder (3.2.3)
     byebug (11.0.1)
-    capybara (3.18.0)
+    capybara (3.19.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)

From 49bc61d0779c166691b2987378cd037b03947379 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Thu, 9 May 2019 12:25:27 -0400
Subject: [PATCH 02/42] Change/shorten post/question button text for sidebar
 (#5685)

* Change/shorten post/question button text for sidebar

* Update _related.html.erb

* Update I18n_test.rb
---
 app/views/sidebar/_related.html.erb | 4 ++--
 config/locales/en.yml               | 4 ++--
 test/integration/I18n_test.rb       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/sidebar/_related.html.erb b/app/views/sidebar/_related.html.erb
index e3c8f3fe37c..feb99e52a26 100644
--- a/app/views/sidebar/_related.html.erb
+++ b/app/views/sidebar/_related.html.erb
@@ -4,9 +4,9 @@
 
   <div id="sidebar" class="d-none d-lg-block">
 
-  <a style="margin-bottom:6px;white-space: normal;" rel="tooltip" title="<%= t('sidebar._related.share_your_work') %>" data-placement="bottom" href="/post" class="btn btn-primary btn-lg btn-block d-lg-none d-xl-block write-research-note requireLogin"><i class="fa fa-pencil fa fa-white"></i> <%= t('sidebar._related.write_research_note') %> &raquo;</a>
+  <a style="margin-bottom:6px;white-space: normal;" rel="tooltip" title="<%= t('sidebar._related.share_your_work') %>" data-placement="bottom" href="/post" class="btn btn-primary btn-lg btn-block d-lg-none d-xl-block write-research-note requireLogin"><i class="fa fa-pencil fa fa-white"></i> <%= t('sidebar._related.write_research_note') %></a>
   <% tagnames = (@node.normal_tags.collect(&:name) + @node.location_tags).join(',') if @tagnames %>
-  <a style="white-space: normal;" rel="tooltip" title="Post <% if @tagnames %>about <%= tagnames %><% else %>research<% end %>" data-placement="bottom" href="/post<%= '?template=question&tags=question:general,'+ tagnames if @tagnames %><% if params[:controller] == 'notes' && params[:action] == 'show' %>,response:<%= @node.id %><% end %>" class="btn btn-primary btn-lg btn-block requireLogin"><i class="fa fa-pencil fa fa-white"></i> <%= t('sidebar._related.ask_a_question') %> &raquo;</a>
+  <a style="white-space: normal;" rel="tooltip" title="Post <% if @tagnames %>about <%= tagnames %><% else %>research<% end %>" data-placement="bottom" href="/post<%= '?template=question&tags=question:general,'+ tagnames if @tagnames %><% if params[:controller] == 'notes' && params[:action] == 'show' %>,response:<%= @node.id %><% end %>" class="btn btn-primary btn-lg btn-block requireLogin"><i class="fa fa-pencil fa fa-white"></i> <%= t('sidebar._related.ask_a_question') %></a>
 
   <% cache('related_sidebar-feature', skip_digest: true) do %>
     <%= feature('sidebar') %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4cd9d05b9ab..d9d46cec5c7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -693,9 +693,9 @@ en:
         by <a href='%{url1}'>%{author_name}</a>
       more: "More..."
     _related:
-      write_research_note: "Write a research note"
+      write_research_note: "Write a post"
       share_your_work: "Share your work with others"
-      ask_a_question: "Ask a related question"
+      ask_a_question: "Ask a question"
       translation: "Translation"
       response_to: "This is a response to"
       responses_to_note: "Responses to this note"
diff --git a/test/integration/I18n_test.rb b/test/integration/I18n_test.rb
index edd10ce8fc9..2c509223e2f 100644
--- a/test/integration/I18n_test.rb
+++ b/test/integration/I18n_test.rb
@@ -397,7 +397,7 @@ class I18nTest < ActionDispatch::IntegrationTest
       follow_redirect!
 
       get '/wiki/' + nodes(:organizers).title.parameterize
-      assert_select 'a', "#{I18n.t('sidebar._related.write_research_note')} " + Sanitize.clean('&raquo;')
+      assert_select 'a', I18n.t('sidebar._related.write_research_note')
     end
   end
 

From 97d7e9867461b29ec59f35710c4734e3cf3a59b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 May 2019 13:02:51 -0400
Subject: [PATCH 03/42] Bump skylight from 4.0.0 to 4.0.1 (#5694)

Bumps [skylight](https://github.com/skylightio/skylight-ruby) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/skylightio/skylight-ruby/releases)
- [Changelog](https://github.com/skylightio/skylight-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/skylightio/skylight-ruby/compare/v4.0.0...v4.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f59fb4fbd33..827c7eac073 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -436,9 +436,9 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    skylight (4.0.0)
-      skylight-core (= 4.0.0)
-    skylight-core (4.0.0)
+    skylight (4.0.1)
+      skylight-core (= 4.0.1)
+    skylight-core (4.0.1)
       activesupport (>= 4.2.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)

From c2e19b557f0d07d35090d035ed9c912c1465d80f Mon Sep 17 00:00:00 2001
From: Sourav Sahoo <souravsahoo66@yahoo.com>
Date: Fri, 10 May 2019 00:59:53 +0530
Subject: [PATCH 04/42] Improved the header of wiki and corrected the
 tabbed:notes functionality (#5697)

---
 app/views/wiki/_header.html.erb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/wiki/_header.html.erb b/app/views/wiki/_header.html.erb
index c5a8b9c2dad..a7d47685718 100644
--- a/app/views/wiki/_header.html.erb
+++ b/app/views/wiki/_header.html.erb
@@ -101,8 +101,8 @@
         </a>
       </li>
 
-      <li class="<%= 'active' if (controller.action_name == 'comments' )%>">
-        <a href="/wiki/<%= @node.slug_from_path %>/comments" rel="tooltip" title="Read Comments regarding this wiki page" data-placement="top">
+      <li class="nav-item" >
+        <a class="nav-link <%= 'active' if (controller.action_name == 'comments' )%>"href="/wiki/<%= @node.slug_from_path %>/comments" rel="tooltip" title="Read Comments regarding this wiki page" data-placement="top">
           <span class="d-none d-md-inline"> <%= @node.comments.size %></span>
           <i class="fa fa-comment"></i>
         </a>
@@ -130,13 +130,13 @@
 <% end %>
 
 <% if @node.has_power_tag('tabbed') %>
-<div class="navbar navbar-light">
+<nav class="navbar navbar-light bg-light navbar-expand">
   <ul class="navbar-nav">
-    <li class="nav-item"><a data-toggle="tab" href="#tab-overview"><%= t('wiki.show.overview') %></a></li>
-    <% if @node.power_tags('tabbed').include?("notes") %><li><a class="nav-link active" data-toggle="tab" href="#tab-notes"><%= t('wiki.show.research') %></a></li><% end %>
-    <% if @node.power_tags('tabbed').include?("wikis") %><li><a class="nav-link active" data-toggle="tab" href="#tab-wikis"><%= raw t('wiki.show.wiki_pages') %></a></li><% end %>
+    <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#tab-overview"><%= t('wiki.show.overview') %></a></li>
+    <% if @node.power_tags('tabbed').include?("notes") %><li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#tab-notes"><%= t('wiki.show.research') %></a></li><% end %>
+    <% if @node.power_tags('tabbed').include?("wikis") %><li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#tab-wikis"><%= raw t('wiki.show.wiki_pages') %></a></li><% end %>
   </ul>
-</div>
+</nav>
 <% end %>
 
 <br />

From 4836e4c975f0377ac978fe9fd8cb08e08ee285d3 Mon Sep 17 00:00:00 2001
From: Gautami Gupta <35326753+gautamig54@users.noreply.github.com>
Date: Fri, 10 May 2019 01:01:14 +0530
Subject: [PATCH 05/42] Simplify SQL queries of hidden_nids and coauthor_nids
 (#5461)

* simplify hidden_nids and coauthor_nids

* fix codeclimate errors1

* fix codeclimate errors2

* remove redundant return statements
---
 app/controllers/application_controller.rb | 7 +------
 app/controllers/home_controller.rb        | 9 ++-------
 app/models/node.rb                        | 4 ++++
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c648854de0d..93817994552 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -32,12 +32,7 @@ def set_sidebar(type = :generic, data = :all, args = {})
       @maps = Tag.find_nodes_by_type(data, 'map', 20)
     else # type is generic
       # remove "classroom" postings; also switch to an EXCEPT operator in sql, see https://github.com/publiclab/plots2/issues/375
-      hidden_nids = Node.joins(:node_tag)
-        .joins('LEFT OUTER JOIN term_data ON term_data.tid = community_tags.tid')
-        .select('node.*, term_data.*, community_tags.*')
-        .where(type: 'note', status: 1)
-        .where('term_data.name = (?)', 'hidden:response')
-        .collect(&:nid)
+      hidden_nids = Node.where(type: :note, status: 1).select { |n| n.has_a_tag('hidden:response') }.collect(&:nid)
       @notes = if params[:controller] == 'questions'
                  Node.questions
                    .joins(:revision)
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 44e18e8a6c5..b2e5697ba75 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -66,12 +66,7 @@ def research
   def activity
     blog = Tag.find_nodes_by_type('blog', 'note', 1).first
     # remove "classroom" postings; also switch to an EXCEPT operator in sql, see https://github.com/publiclab/plots2/issues/375
-    hidden_nids = Node.joins(:node_tag)
-      .joins('LEFT OUTER JOIN term_data ON term_data.tid = community_tags.tid')
-      .select('node.*, term_data.*, community_tags.*')
-      .where(type: 'note', status: 1)
-      .where('term_data.name = (?)', 'hidden:response')
-      .collect(&:nid)
+    hidden_nids = Node.where(type: :note, status: 1).select { |n| n.has_a_tag('hidden:response') }.collect(&:nid)
     notes = Node.where(type: 'note')
       .where('node.nid NOT IN (?)', hidden_nids + [0]) # in case hidden_nids is empty
       .order('nid DESC')
@@ -89,7 +84,7 @@ def activity
       notes = notes.where('(node.status = 1 OR node.status = 4 OR node.status = 3)')
       comments = comments.where('comments.status = 1 OR comments.status = 4')
     elsif current_user
-      coauthor_nids = Node.joins(:node_tag).joins('LEFT OUTER JOIN term_data ON term_data.tid = community_tags.tid').select('node.*, term_data.*, community_tags.*').where(type: 'note', status: 3).where('term_data.name = (?)', "with:#{current_user.username}").collect(&:nid)
+      coauthor_nids = Node.where(type: :note, status: 3).select { |n| n.has_a_tag("with:#{current_user.username}") }.collect(&:nid)
       notes = notes.where('(node.nid IN (?) OR node.status = 1 OR ((node.status = 3 OR node.status = 4) AND node.uid = ?))', coauthor_nids, current_user.uid)
       comments = comments.where('comments.status = 1 OR (comments.status = 4 AND comments.uid = ?)', current_user.uid)
     else
diff --git a/app/models/node.rb b/app/models/node.rb
index a4a8068391e..b33727c421c 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -125,6 +125,10 @@ def slug_from_path
     path.split('/').last
   end
 
+  def has_a_tag(name)
+    return tags.where(name: name).count.positive?
+  end
+
   before_save :set_changed_and_created
   after_create :setup
   before_validation :set_path_and_slug, on: :create

From ef86cca0f5e883fbf67f31cebb246ae309281eeb Mon Sep 17 00:00:00 2001
From: Lekhika Dugtal <lekhidugtal@gmail.com>
Date: Fri, 10 May 2019 01:01:28 +0530
Subject: [PATCH 06/42] add card for people section with bootstrap 4 upgrade
 (#5169)

---
 app/views/map/_peopleLeaflet.html.erb |   2 +-
 app/views/users/list.html.erb         | 157 ++++++++++++++++++--------
 test/integration/I18n_test.rb         |  10 --
 test/integration/public_pages_test.rb |   8 ++
 4 files changed, 116 insertions(+), 61 deletions(-)

diff --git a/app/views/map/_peopleLeaflet.html.erb b/app/views/map/_peopleLeaflet.html.erb
index 1b730448e38..ea1b8d14421 100644
--- a/app/views/map/_peopleLeaflet.html.erb
+++ b/app/views/map/_peopleLeaflet.html.erb
@@ -2,7 +2,7 @@
 <% unique_id = rand(1000) %>
 
   <style>
-  	#map<%= unique_id %> { width:100%; height:300px; margin: 0; position: relative;}
+  	#map<%= unique_id %> { width:100%; height:500px; margin: 0; position: relative;}
   </style>
 
 <div>
diff --git a/app/views/users/list.html.erb b/app/views/users/list.html.erb
index 0e565c81fd7..9529b6c06b2 100644
--- a/app/views/users/list.html.erb
+++ b/app/views/users/list.html.erb
@@ -1,56 +1,113 @@
+<div class="container">
+<div class="row">
+<div class="col-md-6" style="font-family:Junction Regular;">
+<% if current_user && (current_user.role == "admin" || current_user.role == "moderator")%>
+<h3><%= t('users.list.user_moderation') %></h3>
+<p><%= t('users.list.admins_ban_spam') %> </p>
+<% end %>
+  <h2><%= raw t('People') %></h2>
+  <h5><%= t('Recently active on Publiclab') =%></h5>
+    <div>
+    <br>
+      <p style="width: 100%; font-size:14px; text-align: center; border-bottom: 1px solid #ccc; line-height:2px; margin: 10px 0 20px;">
+      <span style="background-color: #fff; padding: 0 10px; color: #808080;">Sort by:
+      <a href = "<%= people_path %>?sort=username" style="text-decoration: underline; color: #808080;"> <%= t('users.list.username') %></a><span> | </span>
+      <a href = "<%= people_path %>?sort=last_activity"style="text-decoration: underline; color: #808080;"> <%= t('users.list.last_activity') %></a><span> | </span>
+      <a href = "<%= people_path %>?sort=joined" style="text-decoration: underline; color: #808080;"><%= t('users.list.joined') %></a><span> | </span>
+      </span>
+      </p>
+      <br/>
+    </div>
+  <div class="row" id="user_cards">
 
-<div class="col-lg-3">
-	<div class='row'>
-		<div class='col-lg-12'>
-			<p> This page shows a list of all Public Lab contributors and is sorted by those who have posted most recently. Click the profile link to view their posting activity. </p>
-		</div>
-	</div>
-  <% if logged_in_as(['admin', 'moderator']) %>
-    <h2><%= t('users.list.user_moderation') %></h2>
-    <p><%= t('users.list.admins_ban_spam') %> </p>
-  <% end %>
-</div>
-<div class="col-lg-9">
-  <h2><%= raw t('users.list.members_last_activity') %></h2>
-  <%= render :partial => "map/peopleLeaflet" , locals: {people: true , lat:23 , lon: 4} %>
-  <table class="table">
-    <tr>
-      <th class="d-lg-none"></th>
-
-      <th style="text-align: center;"><a href = "<%= people_path %>?sort=username"> <%= t('users.list.username') %></a> <i class="fa fa-arrows-v"></i></th>
-      <th><a href = "<%= people_path %>?sort=last_activity"> <%= t('users.list.last_activity') %></a> <i class="fa fa-arrows-v"></i></th>
-      <th><%= t('users.list.history') %></th>
-      <th><a href = "<%= people_path %>?sort=joined"> <%= t('users.list.joined') %></a> <i class="fa fa-arrows-v"></i></th>
-
-      <% if logged_in_as(['admin', 'moderator']) %>
-        <th><%= t('users.list.moderation') %></th>
-      <% end %>
-    </tr>
     <% @users.each do |user| %>
-    <tr>
-      <td class="d-lg-none" style="padding-top: 16px;">
-        <img class="rounded-circle" id="profile-photo" style="width:40px;margin-right:8px;border: 1px solid lightgrey;" src="<%= user.profile_image %>" />
-      </td>
-      <td style="display: flex; align-items: center;">
-        <div class="d-lg-none">
-          <img class="rounded-circle" id="profile-photo" style="width:40px;margin-right:8px;border: 1px solid lightgrey;" src="<%= user.profile_image %>" />
+      <div class ="col-md-6" id="user">
+        <div class="card">
+           <div class="card-body">
+            <div class="profile-image text-center">
+                <img class="rounded-circle img-fluid" id="profile-photo" src="<%= user.profile_image %>" />
+            </div>
+            <br>
+            <div class="card-info">
+            <a href="/profile/<%= user.username %>"><%= user.username %></a>
+              <div class="sub-info">
+                <div>Last Activity : <%= t = user.revisions.order(timestamp: :desc).first.try(:created_at);time_ago_in_words(t) if (t) %></div>
+                <div>History : <%= user.nodes.count %> <%= t('users.list.notes_and_edits') %></div>
+                <div> Joined : <%= distance_of_time_in_words(user.created_at, Time.current, { include_seconds: false, scope: 'datetime.time_ago_in_words' }) %></div>
+              </div>
+              <% if current_user && (current_user.role == "admin" || current_user.role == "moderator") %>
+                <div style="padding-top:16px; text-align:center;">
+                  <% if user.status == 0 %>
+                    <i class='fa fa-ban' style="color:#a00;font-size:1em"></i> <%= t('users.list.banned') %>
+                  <% elsif user.status == 1 %>
+                    <a class="btn btn-outline-secondary btn-sm" style="font-size:1em;" data-confirm="<%= t('users.list.are_you_sure') %>" href="/ban/<%= user.uid %>" ><i class='fa fa-ban'></i> <%= t('users.list.ban') %></a>
+                  <% end %>
+                </div>
+               <% end %>
+            </div>
+            </div>
+          </div>
         </div>
-        <a style="margin-left: 12px;" href="/profile/<%= user.username %>"><%= user.username %></a>
-      </td>
-      <td style="padding-top:16px;"><%= t = user.revisions.order(timestamp: :desc).first.try(:created_at);time_ago_in_words(t) if (t) %></td>
-      <td style="padding-top:16px;"><%= user.nodes.count %> <%= t('users.list.notes_and_edits') %></td>
-      <td style="padding-top:16px;"><%= distance_of_time_in_words(user.created_at, Time.current, { include_seconds: false, scope: 'datetime.time_ago_in_words' }) %></td>
-      <% if logged_in_as(['admin', 'moderator']) %>
-      <td style="padding-top:16px;">
-        <% if user.status == 0 %>
-          <i class='fa fa-ban' style="color:#a00;"></i> <%= t('users.list.banned') %>
-        <% elsif user.status == 1 %>
-          <a class="btn btn-outline-secondary btn-sm" data-confirm="<%= t('users.list.are_you_sure') %>" href="/ban/<%= user.uid %>" ><i class='fa fa-ban'></i> <%= t('users.list.ban') %></a>
-        <% end %>
-      </td>
       <% end %>
-     </tr>
-    <% end %>
-  </table>
+  </div>
   <%= will_paginate @users, renderer: WillPaginate::ActionView::BootstrapLinkRenderer unless @unpaginated %>
 </div>
+<div class="col-md-6 d-none d-md-block" style="margin-top:2em;">
+<%= render :partial => "map/peopleLeaflet" , locals: {people: true , lat:23 , lon: 4} %>
+</div>
+<div class="col-md-6 d-md-none" style="margin-top:2em;">
+<%= render :partial => "map/peopleLeaflet" , locals: {people: true , lat:23 , lon: 4} %>
+</div>
+</div>
+</div>
+<style>
+#user {
+  padding:10px 8px 10px 8px
+}
+
+h5 {
+  color: #666;
+}
+.card {
+  background-color: #fff;
+  border: 1px solid;
+  border-color: #D3D3D3;
+  border-radius: 6px;
+}
+
+.card-body {
+  margin-bottom:0.3em;
+}
+
+.profile-image {
+  margin-top: 0.5em;
+}
+
+#profile-photo {
+  width: 6.5em;
+  border-color:#555;
+  border: 1px solid lightgrey;
+}
+
+.card-info {
+  padding-left: 1em;
+  padding-right:1em;
+}
+
+.card-info a{
+  font-size:1.2em;
+  margin-bttom:1em;
+  color:#222;
+}
+
+.sub-info {
+  color:#666;
+  font-size:0.8em;
+}
+
+.affix {
+    top:50px;
+    right:0;
+    position:fixed;
+}
+</style>
diff --git a/test/integration/I18n_test.rb b/test/integration/I18n_test.rb
index 2c509223e2f..985e01cef52 100644
--- a/test/integration/I18n_test.rb
+++ b/test/integration/I18n_test.rb
@@ -242,16 +242,6 @@ class I18nTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test 'should choose i18n for user/list' do
-    available_testing_locales.each do |lang|
-      get '/change_locale/' + lang.to_s
-      follow_redirect!
-
-      get '/people'
-      assert_select 'th', I18n.t('users.list.username')
-    end
-  end
-
   test 'should choose i18n for user/map' do
     available_testing_locales.each do |lang|
       get '/change_locale/' + lang.to_s
diff --git a/test/integration/public_pages_test.rb b/test/integration/public_pages_test.rb
index b91eb7a0887..8079248816a 100644
--- a/test/integration/public_pages_test.rb
+++ b/test/integration/public_pages_test.rb
@@ -96,4 +96,12 @@ def setup
     get '/assets'
     assert_response :success
   end
+
+  test 'browse people page' do
+    get '/people'
+    assert_response :success
+  end
+
 end
+
+

From 59a077323bcafefe9a0becb37636859f22bf8bf0 Mon Sep 17 00:00:00 2001
From: Sasha Boginsky <41092741+sashadev-sky@users.noreply.github.com>
Date: Thu, 9 May 2019 15:56:17 -0400
Subject: [PATCH 07/42] Add to config/locales file (#5659)

---
 app/views/tag/show/_tab_content.html.erb | 2 +-
 config/locales/en.yml                    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/tag/show/_tab_content.html.erb b/app/views/tag/show/_tab_content.html.erb
index 2a3cdccdbb3..736fdd1ef35 100644
--- a/app/views/tag/show/_tab_content.html.erb
+++ b/app/views/tag/show/_tab_content.html.erb
@@ -47,7 +47,7 @@
   <% if @node_type == "maps" %>
     <div class="tab-pane active" id="wikis">
      <% if @nodes.empty? %>
-        <p><strong>Sorry, no map is tagged with `<%= params[:id] %>` tag. You can view other maps <a href="/maps">here</a>.</strong></p>
+        <p><%= raw t('tag.show.no_map_results_found', :tag => params[:id]) %>. You can view other maps <a href="/maps">here</a>.</p>
       <% else %>
         <%= render :partial => "map/maps" %>
       <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d9d46cec5c7..eaffd0d082d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -390,6 +390,7 @@ en:
       maps: "Maps"
       no_results_found: "No results found; try searching for '<b>%{tag}</b>'"
       try_advanced_search: "Or try an <a href='%{url1}'>advanced search</a>"
+      no_map_results_found: "Sorry, no map is tagged with <i>%{tag}</i>"
       contributors: "Contributors"
     contributors-index:
       contributors_over_last_week: "Contributors for <i style=\"color:#aaa;\">%{tag_name}</i>

From 2bc7b498ef3a05bc090ef26f316a30ec0104bcc6 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Thu, 9 May 2019 17:15:32 -0400
Subject: [PATCH 08/42] Update mailman_server

---
 script/mailman_server | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/script/mailman_server b/script/mailman_server
index 81ea1fd6886..e3e096f9ecf 100755
--- a/script/mailman_server
+++ b/script/mailman_server
@@ -24,10 +24,12 @@ Mailman::Application.run do
   # route for mail having node with id in their subject will only be accepted for processing
   default do
   	begin
+      retries ||= 0
       Comment.receive_mail(message)
     rescue Exception => e
       Mailman.logger.error "Exception occurred while receiving message:\n#{message}"
       Mailman.logger.error [e, *e.backtrace].join("\n")
+      retry if (retries += 1) < 3
     end
   end
 

From 6ce0e4f27b01148ac9f99d4eb687c9ff6fcd6020 Mon Sep 17 00:00:00 2001
From: Sourav Sahoo <souravsahoo66@yahoo.com>
Date: Fri, 10 May 2019 03:35:57 +0530
Subject: [PATCH 09/42] Corrected the dropdown distributed in tag creation form
 (#5699)

---
 app/views/tag/_advanced_tagging.html.erb | 48 ++++++++++++------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/app/views/tag/_advanced_tagging.html.erb b/app/views/tag/_advanced_tagging.html.erb
index dab4532d3dd..17f8954c713 100644
--- a/app/views/tag/_advanced_tagging.html.erb
+++ b/app/views/tag/_advanced_tagging.html.erb
@@ -1,28 +1,26 @@
-<div class="dropdown">
-    <button type="button" class="btn btn-outline-secondary dropdown-toggle" id="pt-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-cog"></i></button>
-    <div class="dropdown-menu dropdown-menu-right float-right" style="margin-top:5px;" id="pt-list">
-      <% if current_user %>
-        <h6 class="dropdown-header">Recently used tags</h6>
-        <% NodeTag.where(uid: current_user.id).order('date DESC').limit(5).each do |tag| %>
-          <a class="dropdown-item" onClick="addTag('<%= tag.name %>')"><i><%= tag.name %></i></a>
-        <% end %>
-      <% end %>
-      <div class="dropdown-divider"></div>
-      <% if @node && @node.type == "page" %>
-        <a class="dropdown-item" href="#" data-value="parent:">Link to a "parent" page (wikis only)</a>
-        <a class="dropdown-item" href="#" data-value="style:">Add style</a>
-        <a class="dropdown-item" href="#" data-value="lang:">Add Translation widget</a>
-      <% else %>
-        <a class="dropdown-item" href="#" data-value="seeks:photos">Request response photos</a>
-        <a class="dropdown-item" href="#" data-value="hidden:response">Hide responses from dashboard</a>
-        <a class="dropdown-item" href="#" data-value="with:">Add Coauthor (notes only)</a>
-        <a class="dropdown-item" href="#" data-value="series:">Mark as part of a series</a>
-        <a class="dropdown-item" href="#" data-value="comment-template:">Add template to the comment form</a>
-        <a class="dropdown-item" target="_blank" href="/wiki/comment-templates">Write a template for the comment form</a>
-      <% end %>
-      <div class="dropdown-divider"></div>
-      <a class="dropdown-item" href="https://publiclab.org/power-tags" target="_blank">Learn About Powertags</a>
-    </div>
+<button type="button" class="btn btn-outline-secondary dropdown-toggle" id="pt-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-cog"></i></button>
+<div class="dropdown-menu dropdown-menu-right float-right" style="margin-top:5px;" id="pt-list">
+  <% if current_user %>
+    <h6 class="dropdown-header">Recently used tags</h6>
+    <% NodeTag.where(uid: current_user.id).order('date DESC').limit(5).each do |tag| %>
+      <a class="dropdown-item" onClick="addTag('<%= tag.name %>')"><i><%= tag.name %></i></a>
+    <% end %>
+  <% end %>
+  <div class="dropdown-divider"></div>
+  <% if @node && @node.type == "page" %>
+    <a class="dropdown-item" href="#" data-value="parent:">Link to a "parent" page (wikis only)</a>
+    <a class="dropdown-item" href="#" data-value="style:">Add style</a>
+    <a class="dropdown-item" href="#" data-value="lang:">Add Translation widget</a>
+  <% else %>
+    <a class="dropdown-item" href="#" data-value="seeks:photos">Request response photos</a>
+    <a class="dropdown-item" href="#" data-value="hidden:response">Hide responses from dashboard</a>
+    <a class="dropdown-item" href="#" data-value="with:">Add Coauthor (notes only)</a>
+    <a class="dropdown-item" href="#" data-value="series:">Mark as part of a series</a>
+    <a class="dropdown-item" href="#" data-value="comment-template:">Add template to the comment form</a>
+    <a class="dropdown-item" target="_blank" href="/wiki/comment-templates">Write a template for the comment form</a>
+  <% end %>
+  <div class="dropdown-divider"></div>
+  <a class="dropdown-item" href="https://publiclab.org/power-tags" target="_blank">Learn About Powertags</a>
 </div>
 
 <script type="text/javascript">

From f044a99f40baadf96ce9e334a42476ce8db71996 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Thu, 9 May 2019 18:33:44 -0400
Subject: [PATCH 10/42] tweaks to comment options (#5700)

---
 app/views/notes/_comment.html.erb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/views/notes/_comment.html.erb b/app/views/notes/_comment.html.erb
index fde5743fc9b..c53418eae8d 100644
--- a/app/views/notes/_comment.html.erb
+++ b/app/views/notes/_comment.html.erb
@@ -49,17 +49,14 @@
       -->
       <% end %>
 
+      <% if comment.comment_via == 1 %>
+        <i data-toggle="tooltip" title="This comment was posted by email." class="fa fa-envelope"></i>
+      <% end %>
       <% if current_user && comment.uid == current_user.uid %>
         <a class="btn btn-outline-secondary btn-sm" href="javascript:void(0)" onClick="$('#c<%= comment.cid %>edit').toggle();$('#c<%= comment.cid %>show').toggle();setInit(<%= comment.cid %>);">
           <i class="fa fa-pencil"></i>
         </a>
       <% end %>
-      <% if comment.comment_via == 1 %>
-        <a href="#" onclick="return false;" class="btn btn-outline-secondary btn-sm"><i class="fa fa-envelope"></i></a>
-      <% end %>
-      <% if params[:controller] == "questions" && logged_in_as(['admin', 'moderator']) || (current_user && (comment.uid == current_user.uid)) %>
-        <a class="btn btn-outline-secondary btn-sm" id="comment-<%= comment.id %>-reorder-btn" data-remote="true" data-confirm="Are you sure? <% if current_user && comment.uid != current_user.uid %>Please exercise caution in promoting others' comments; this cannot be undone.<% end %>" rel="tooltip" title="<%= t('questions._comment.promotion') %>" data-placement="left" href="/comment/make_answer/<%= comment.id %>"><i class="fa fa-plus"></i></a>
-      <% end %>
       <% if current_user &. can_moderate? %>
         <a rel="tooltip" title="Mark as spam" class="btn btn-sm btn-outline-secondary btn-flag-spam-<%= comment.id %>" data-confirm="Are you sure? The user will no longer be able to log in or publish, and their content will be hidden except comments." href="/admin/mark_comment_spam/<%= comment.id %>">
           <i class="fa fa-ban"></i>

From eaede1d3a376341ace5eb36f70cd8bbadc49baf8 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Fri, 10 May 2019 12:36:59 -0400
Subject: [PATCH 11/42] Update comments.css

---
 app/assets/stylesheets/comments.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/comments.css b/app/assets/stylesheets/comments.css
index 841944ecb68..0885102ca08 100644
--- a/app/assets/stylesheets/comments.css
+++ b/app/assets/stylesheets/comments.css
@@ -29,4 +29,8 @@
   font-family: "Helvetica Neue";
   border-left: 5px solid #736f6f;
   background-color: #f3f1ef;
-}
\ No newline at end of file
+}
+
+#comments-list .comment p img {
+  max-width: 100%;
+}

From a3e40c5cb20e94653de20a74e0ac9553c87f0d3a Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Fri, 10 May 2019 12:37:39 -0400
Subject: [PATCH 12/42] change "parent" label to "alias" (#5702)

---
 app/views/tag/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/tag/show.html.erb b/app/views/tag/show.html.erb
index 2bd636d00b4..a797acc9b46 100644
--- a/app/views/tag/show.html.erb
+++ b/app/views/tag/show.html.erb
@@ -6,7 +6,7 @@
   <%= render partial: 'tag/show/contributors' %>
 
   <% unless @tags.try(:first).try(:parent).nil? %>
-    <small>parent: <%= @tags.first.parent %></small>
+    <small>Alias of: <%= @tags.first.parent %></small>
   <% end %>
 
   <%= render :partial => "notes/format_toggle" if @node_type == "note" %>

From 5e46b43d280037bb9c519d3064ac87585436b376 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Fri, 10 May 2019 15:07:59 -0400
Subject: [PATCH 13/42] wiki image fix for #5650 (#5703)

---
 app/assets/javascripts/editor.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/editor.js b/app/assets/javascripts/editor.js
index 6b6285e02e2..b6c6ad14514 100644
--- a/app/assets/javascripts/editor.js
+++ b/app/assets/javascripts/editor.js
@@ -39,7 +39,8 @@ $E = {
 
   // wraps currently selected text in textarea with strings a and b
   wrap: function(a,b,args) {
-    this.refresh();
+    var isWiki = (window.location + '').includes('wiki');
+    if (!isWiki) this.refresh();
     var len = $E.textarea.val().length;
     var start = $E.textarea[0].selectionStart;
     var end = $E.textarea[0].selectionEnd;

From d06f59460edf0424a6edbfc4000ac8444145fc5d Mon Sep 17 00:00:00 2001
From: Sidharth Bansal <20972099+SidharthBansal@users.noreply.github.com>
Date: Sat, 11 May 2019 01:38:36 +0530
Subject: [PATCH 14/42] (don't merge yet) Removal of email/username field for
 MK & SWB (#5640)

* OAuth route creation for MK and SWB

* OAuth routes created

* Github working properly

* Modified the route to accept the provider

* OAuth completed

* removed codeclimate issues

* Documentation added

* test modified

* tests modified

* modified test to have roles

* Travis is passing

* Added OAuth tests

* made travis pass

* username removed from CDSM

* Removed redundant test

* Fixing date issue in subscription mailer (#5638)

* add nid to rss titles (#5644)

* Fix scraped image system test bug (#5646)

* Fix scraped image system test bug

* Update node_test.rb

* Create post_test.rb to test posting at /post (#5605)

* Create post_test.rb

*     UserSession.create(users(:bob)) # log in

* Update post_test.rb

* Update rich.html.erb

* Update post_test.rb

* Update post_test.rb

* Trying login via modal

* add login-button id

* Update post_test.rb

* Update post_test.rb

* Update post_test.rb

* locators instead of css

"It appears you may be passing a CSS selector or XPath expression rather than a locator. Please see the documentation for acceptable locator values."

* locators instead of css

"It appears you may be passing a CSS selector or XPath expression rather than a locator. Please see the documentation for acceptable locator values."

* Update post_test.rb

* /images/pl.png in scraped image

* /images/pl.png in scraped image

* Update post_test.rb

* add assert_page_reloads

* Update post_test.rb

* Update post_test.rb

* Update post_test.rb

* Update post_test.rb

* fixed image drag and drop bug (#5657)

* Database tweaks for performance (#5575)

* Database tweaks for performance

* Reduce innodb buffer pool size because of low memory

* Reduce RAM burden

* Reduce memory consumption following mysqltuner advice.

* Even more conservative limits for RAM

* Update home.html.erb

* Corrected the number of notes appearing on one line (#5661)

* Some mistakes corrected in notes.html.erb

* Wait 4

* Issue 5259: Used logged_in_as method to replace current_user.role condition (#5660)

* Update subscriptions.html.erb

* fix logged_in_as in controllers (#5677)

* fix logged_in_as in controllers

* add wait 4 to system test... odd

* Update subscriptions.html.erb

* Update subscriptions.html.erb

* Bump cytoscape from 3.5.4 to 3.6.0 (#5662)

Bumps [cytoscape](https://github.com/cytoscape/cytoscape.js) from 3.5.4 to 3.6.0.
- [Release notes](https://github.com/cytoscape/cytoscape.js/releases)
- [Commits](https://github.com/cytoscape/cytoscape.js/compare/v3.5.4...v3.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Dashboard system test (#5682)

* Dashboard system test

* Update dashboard_test.rb

*   Capybara.default_max_wait_time = 5

* fix
---
 app/controllers/openid_controller.rb | 14 +++++---------
 app/controllers/users_controller.rb  |  2 +-
 test/integration/openid_test.rb      | 23 -----------------------
 3 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/app/controllers/openid_controller.rb b/app/controllers/openid_controller.rb
index b76d7138a22..f99f1093d40 100644
--- a/app/controllers/openid_controller.rb
+++ b/app/controllers/openid_controller.rb
@@ -88,12 +88,9 @@ def index
 
       if oidreq
 
-        if current_user && !requested_username.casecmp(current_user.username.downcase).zero?
-          flash[:error] = "You are requesting access to an account that's not yours. Please <a href='/logout'>log out</a> and use the correct account, or <a href='" + oidreq.trust_root + "'>try to login with the correct username</a>"
-          redirect_to '/dashboard'
-        else
-          oidresp = nil
-          if oidreq.is_a?(CheckIDRequest)
+
+        oidresp = nil
+        if oidreq.is_a?(CheckIDRequest)
 
             identity = oidreq.identity
 
@@ -139,12 +136,11 @@ def index
               return
             end
 
-          else
+        else
             oidresp = server.handle_request(oidreq)
           end
 
-          render_response(oidresp)
-        end
+        render_response(oidresp)
       else
         session[:openid_return_to] = request.env['ORIGINAL_FULLPATH']
         if provider
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8153ff68911..2527665b77e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -32,7 +32,7 @@ def create
           flash[:notice] += " " + I18n.t('users_controller.continue_where_you_left_off', url1: params[:return_to].to_s)
         end
         flash[:notice] = flash[:notice].html_safe
-        flash[:warning] = I18n.t('users_controller.spectralworkbench_or_mapknitter', url1: "'#{session[:openid_return_to]}'").html_safe if session[:openid_return_to]
+        flash[:warning] = I18n.t('users_controller.spectralworkbench_or_mapknitter', url1: "#{session[:openid_return_to]}'").html_safe if session[:openid_return_to]
         session[:openid_return_to] = nil
         redirect_to "/dashboard"
       end
diff --git a/test/integration/openid_test.rb b/test/integration/openid_test.rb
index 9d36e2cb7b1..74187bd2f81 100644
--- a/test/integration/openid_test.rb
+++ b/test/integration/openid_test.rb
@@ -5,29 +5,6 @@ class LoginFlowTest < ActionDispatch::IntegrationTest
   test 'attempt to openid authenticate (like from MapKnitter) without being logged in' do
   end
 
-  test 'incorrect openid authentication request shows error' do
-
-    # log in
-    post '/user_sessions', params: { user_session: { username: users(:jeff).username, password: 'secretive' } }
-    follow_redirect!
-
-    get '/openid', params: {
-      'openid.claimed_id': 'https://spectralworkbench.org/openid/warren',
-      'openid.identity': 'https://spectralworkbench.org/openid/warren',
-      'openid.mode': 'checkid_setup',
-      'openid.ns': 'http://specs.openid.net/auth/2.0',
-      'openid.ns.sreg': 'http://openid.net/extensions/sreg/1.1',
-      'openid.realm': 'https://spectralworkbench.org/',
-      'openid.return_to': 'https://spectralworkbench.org/session/new?authenticity_token=RcLcGH3lzSTCC24UpPnNm56sllNaMrHg5%2FSrQzNxB%2B4%3D&back_to=&open_id=warren&return_to=',
-      'openid.sreg.required': 'nickname,email'
-    }
-
-    assert_equal "You are requesting access to an account that's not yours. Please <a href='/logout'>log out</a> and use the correct account, or <a href='https://spectralworkbench.org/'>try to login with the correct username</a>", flash[:error]
-
-    assert_response :redirect
-
-  end
-
   test 'openid authentication request does not go to index page' do
     # test using basic login button on MK or SWB
     # log in

From fe2ffd6d71b9c5fc7c4ff09bb9d770ce30f4fe78 Mon Sep 17 00:00:00 2001
From: Sourav Sahoo <souravsahoo66@yahoo.com>
Date: Sat, 11 May 2019 02:01:23 +0530
Subject: [PATCH 15/42] Corrected the user signup page (#5704)

* Corrected the user signup page

* Corrected the animals in the verification state of the signup

* Update _create_form.html.erb
---
 app/views/users/_create_form.html.erb | 35 +++++++++++++--------------
 app/views/users/_spamaway.html.erb    | 10 +++-----
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/app/views/users/_create_form.html.erb b/app/views/users/_create_form.html.erb
index 2798f400dd1..2c24180fe96 100644
--- a/app/views/users/_create_form.html.erb
+++ b/app/views/users/_create_form.html.erb
@@ -1,27 +1,26 @@
 <div style="padding:10px;">
- <%= form_for :user, :as => :user, :url => "/register", :html => {:class => "row"} do |f| %>
+ <%= form_for :user, :as => :user, :url => "/register", :html => {:class => "container"} do |f| %>
  <% if f.error_messages != "" %><div class="alert alert-danger"><%= f.error_messages %></div><% end %>
 
   <input type="hidden" name="return_to" class="login-modal-redirect" value="<%= params[:return_to] || request.fullpath %>" />
 
-  <div class="container">
 
     <% cache('feature_signup-notice-top', skip_digest: true) do %>
       <%= feature('signup-notice-top') %>
     <% end %>
 
-    <div class='col-md-12' style="display:flex; justify-content: center;">
+    <div style="display:flex; justify-content: center;" class="col-12">
       <h3> Sign up with </h3>
     </div>
 
-    <div class='col-md-12' style="display:flex; justify-content: center;">
+    <div style="display:flex; justify-content: center;" class="col-12">
       <%= render :partial => "layouts/social_icons" %>
     </div>
 
     <br style="clear:both;"/>
+    <div class="row">
       <div class="col-md-6">
-        <div class="row">
-        <div class="form-group col-md-12" id="username_div">
+        <div class="form-group" id="username_div">
           <label for="username"><%= t('user_sessions.new.username') %></label>
           <%= f.text_field :username, { tabindex: 1, placeholder: "Username", class: 'form-control', id: 'username-signup' } %>
           <label class="username-check"></label>
@@ -31,7 +30,6 @@
           <label for="email"><%= t('users._form.email') %></label>
           <%= f.text_field :email, { tabindex: 3, placeholder: "you@email.com", class: 'form-control', id: 'email' } %>
         </div>
-        </div>
       </div>
      
       <div class="col-md-6" style="display:flex; justify-content: center;">
@@ -47,7 +45,7 @@
       </div>
     </div>
 
-    <div class="form-group col-md-12 nopadding">
+    <div class="form-group row">
       <div class="form-group col-md-6">
         <label for="password"><%= t('users._form.create_password') %></label>
         <%= f.password_field :password, { placeholder: 'Enter your new password',
@@ -69,23 +67,25 @@
       </div>
     </div>
 
-    <div class="form-group col-md-12">
-      <label for="user_bio"><%= t('users._form.bio') %></label>
-      <%= f.text_area :bio, { placeholder: I18n.t('users._form.add_bio'),
-                                          rows: 8,
-                                          class: 'form-control',
-                                          tabindex: 6 }
-      %>
+    <div class="form-group row">
+      <div class="col-md-12">
+        <label for="user_bio"><%= t('users._form.bio') %></label>
+        <%= f.text_area :bio, { placeholder: I18n.t('users._form.add_bio'),
+                                            rows: 8,
+                                            class: 'form-control',
+                                            tabindex: 6 }
+        %>
+      </div>
     </div>
 
     <% if Rails.env == "production" && !params[:spamaway] %>
-      <div class="col-md-12 recaptcha-container">
+      <div class="recaptcha-container">
         <%= recaptcha_tags %>
         <p>If you cannot use the ReCaptcha to verify you are not a bot, <a href="/signup?spamaway=true">use this alternative verification</a>.</p>
       </div>
     <% else %>
 
-    <div class="col-md-12">
+    <div>
       <%= render partial: 'users/spamaway', locals: {caller: caller } %>
     </div>
 
@@ -118,7 +118,6 @@
       </script>
     </div>
 
-  </div>
   <% end %>
   
   <% cache('feature_signup-notice', skip_digest: true) do %>
diff --git a/app/views/users/_spamaway.html.erb b/app/views/users/_spamaway.html.erb
index 0208bb0fc3f..94d449e059c 100644
--- a/app/views/users/_spamaway.html.erb
+++ b/app/views/users/_spamaway.html.erb
@@ -13,13 +13,11 @@
     <% turingtest = Spamaway.get_pairs vars.length %>
     <% turingtest.each_index do |i| %>
 
-        <div class="btn-group btn-group-justified" role="group">
+        <div class="btn-group d-flex" role="group">
           <% [0,1].each_with_index do |s, j| %><% statement = turingtest[i][s] %>
-            <div class="btn-group" role="group">
-              <button type="button" class="col-5 btn btn-outline-secondary" style="font-size:3em;text-align:left;<% if i.odd? %> background:#eef;<% end %>" id="spamaway-<%= caller %>-<%= i.to_s + j.to_s %>">
-              <%= spam.radio_button vars[i], statement, { id: "spamaway_statement_#{caller}_#{i.to_s}#{j.to_s}" } %> <%= statement %>
-              </button>
-            </div>
+            <button type="button" class="col-5 btn btn-outline-secondary" style="font-size:3em;text-align:left;<% if i.odd? %> background:#eef;<% end %>" id="spamaway-<%= caller %>-<%= i.to_s + j.to_s %>">
+            <%= spam.radio_button vars[i], statement, { id: "spamaway_statement_#{caller}_#{i.to_s}#{j.to_s}" } %> <%= statement %>
+            </button>
           <% end %>
         </div>
         <br />

From dfe803991f5043aa85a829883ea65636d8c0776d Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Mon, 13 May 2019 14:27:42 -0400
Subject: [PATCH 16/42] Update tag.count on add_tag (#5718)

---
 app/models/node.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/node.rb b/app/models/node.rb
index b33727c421c..2e82a08fe0b 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -760,6 +760,7 @@ def add_tag(tagname, user)
 
           if node_tag.save
             saved = true
+            tag.run_count # update count of tag usage
             # send email notification if there are subscribers, status is OK, and less than 1 month old
             unless tag.subscriptions.empty? || status == 3 || status == 4 || created < (DateTime.now - 1.month).to_i
               SubscriptionMailer.notify_tag_added(self, tag, user).deliver_now

From 7f7c88e2f05ae19b409b8388f497a0ec8bd9c7fb Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Mon, 13 May 2019 15:43:32 -0400
Subject: [PATCH 17/42] sort related tags by co-occurence (#5715)

* sort related tags by co-occurence

* Update tag.rb
---
 app/models/tag.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/models/tag.rb b/app/models/tag.rb
index 868c392ff58..925f4260b27 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -365,6 +365,11 @@ def self.related(tag_name, count = 5)
                      .where(Tag.table_name => { name: tag_name })
                      .select(:nid)
 
+      # sort them by how often they co-occur:
+      nids = nids.group_by{ |v| v }.map{ |k, v| [k, v.size] }
+      nids = nids.collect(&:first)[0..4]
+                 .collect(&:nid) # take top 5
+
       Tag.joins(:node_tag)
          .where(NodeTag.table_name => { nid: nids })
          .where.not(name: tag_name)

From 597bd2c98c8275292ef3b244c0412669aa7edf33 Mon Sep 17 00:00:00 2001
From: Enrique Plata <48219815+eplata31@users.noreply.github.com>
Date: Mon, 13 May 2019 19:44:21 -0500
Subject: [PATCH 18/42] Fix #5527 - Include hyphens in tags (#5717)

---
 config/initializers/constants.rb | 2 +-
 test/fixtures/revisions.yml      | 8 ++++++++
 test/unit/revision_test.rb       | 8 ++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb
index dad341b5707..9369009fef4 100644
--- a/config/initializers/constants.rb
+++ b/config/initializers/constants.rb
@@ -1,7 +1,7 @@
 module Callouts
   FINDER = /([^`\w]|^)\@([\w-]+)/
   HASHTAG = /(\s)\#([:a-zA-Z0-9_-]+)/
-  HASHTAGWITHOUTNUMBER = /(\s)\#([:0-9_-]*[a-zA-Z]+[:0-9_-]*)/
+  HASHTAGWITHOUTNUMBER = /(\s)\#([:0-9_-]*[a-zA-Z_-]+[:a-zA-Z0-9_-]*)/
   PRETTYLINKMD = '\1[@\2](/profile/\2)'
   HASHLINKMD = '\1[#\2](/tag/\2)'
   HASHTAGNUMBER = /(\s)\#([:0-9]+)/
diff --git a/test/fixtures/revisions.yml b/test/fixtures/revisions.yml
index 8c43ce2c9cd..fbf31d10a95 100644
--- a/test/fixtures/revisions.yml
+++ b/test/fixtures/revisions.yml
@@ -127,6 +127,14 @@ hashtag_four:
     # Heading 2
     Here is another #hashtag
 
+hashtag_with_hyphens:
+  nid: 2
+  uid: 2
+  title: Hashtag post with hypen
+  body: |+
+    Something about hashtag
+    Here is a hashtag with hyphen #purple-air-ok
+
 hashtag_with_punctuation:
   nid: 1
   uid: 1
diff --git a/test/unit/revision_test.rb b/test/unit/revision_test.rb
index a1b08091ab9..da88aec9a9d 100644
--- a/test/unit/revision_test.rb
+++ b/test/unit/revision_test.rb
@@ -121,6 +121,14 @@ class RevisionsTest < ActiveSupport::TestCase
     assert_includes tag_names, 'hashtags'
   end
 
+  test 'should make tag with hyphens' do
+    revision = revisions(:hashtag_with_hyphens)
+    revision.save
+    associated_tags = revision.parent.tag
+    tag_names = associated_tags.map(&:name)
+    assert_includes tag_names, 'purple-air-ok'
+  end
+
   test 'should ignore subheaders' do
     revision = revisions(:subheader)
     revision.save

From 5e39ef238bdd63133bc9f39003b7ed36500547ae Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Tue, 14 May 2019 22:13:14 -0400
Subject: [PATCH 19/42] Update show.html.erb

---
 app/views/tag/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/tag/show.html.erb b/app/views/tag/show.html.erb
index a797acc9b46..44061c502c8 100644
--- a/app/views/tag/show.html.erb
+++ b/app/views/tag/show.html.erb
@@ -33,7 +33,7 @@
   <%= render partial: "tag/show/questions" %>
   <%= render partial: "tag/show/related_tags" %>
   <% if @related_tags %>
-    <p> <%= render partial: 'tag/subscribe_button', locals:{tags: @related_tags } %></p>
+    <%= render partial: 'tag/subscribe_button', locals: {tags: @related_tags } %>
   <% end %>
   <%= render partial: 'tag/show/nav_tabs' %>
 

From 4e5ece92c172898193d72b28df03b8b1df8007e6 Mon Sep 17 00:00:00 2001
From: Anthonia Okafor <40716023+AnthoniaOkafor@users.noreply.github.com>
Date: Wed, 15 May 2019 03:38:26 +0100
Subject: [PATCH 20/42] change deliver_now to deliver_later in
 answer_like_controller (#5533)

* mail deliver_later for answer_like_controller

* comitting answer_like_controller

* Revert "comitting answer_like_controller"

This reverts commit d7e1a1108f5df54a64a69a9df0c6fbf0f7aaaa53.
---
 app/controllers/answer_like_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/answer_like_controller.rb b/app/controllers/answer_like_controller.rb
index 92b277f37bd..deadc157363 100644
--- a/app/controllers/answer_like_controller.rb
+++ b/app/controllers/answer_like_controller.rb
@@ -12,7 +12,7 @@ def likes
     else
       AnswerSelection.set_likes(current_user.uid, @answer.id, true)
       user = User.find(current_user.uid)
-      AnswerMailer.notify_answer_like(user, @answer).deliver_now
+      AnswerMailer.notify_answer_like(user, @answer).deliver_later
     end
     @answer.reload
     respond_to do |format|

From b8011954823c2e76cd53e2113353c5dcd5bd46cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 May 2019 09:51:12 -0400
Subject: [PATCH 21/42] Bump capybara from 3.19.0 to 3.20.0 (#5723)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.19.0 to 3.20.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.19.0...3.20.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 Gemfile.lock | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 827c7eac073..9173600c59c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -68,13 +68,14 @@ GEM
     buftok (0.2.0)
     builder (3.2.3)
     byebug (11.0.1)
-    capybara (3.19.0)
+    capybara (3.20.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (~> 1.2)
+      uglifier
       xpath (~> 3.2)
     childprocess (1.0.1)
       rake (< 13.0)

From 67231f9cb3e88d2b80730cd1f43d9cd19f77ca65 Mon Sep 17 00:00:00 2001
From: Sidharth Bansal <20972099+SidharthBansal@users.noreply.github.com>
Date: Fri, 17 May 2019 00:34:05 +0530
Subject: [PATCH 22/42] redirect to dashboard rectified (#5731)

---
 app/controllers/user_sessions_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/user_sessions_controller.rb b/app/controllers/user_sessions_controller.rb
index 73e8a815435..4a4cf4c5cba 100644
--- a/app/controllers/user_sessions_controller.rb
+++ b/app/controllers/user_sessions_controller.rb
@@ -58,8 +58,10 @@ def handle_social_login_flow(auth)
         if session[:openid_return_to] # for openid login, redirects back to openid auth process
           return_to = session[:openid_return_to]
           session[:openid_return_to] = nil
+          redirect_to return_to + hash_params
+        else
+          redirect_to return_to + hash_params, notice: "Signed in!"
         end
-        redirect_to return_to + hash_params, notice: "Signed in!"
       else # identity does not exist so we need to either create a user with identity OR link identity to existing user
         if User.where(email: auth["info"]["email"]).empty?
           # Create a new user as email provided is not present in PL database

From ccc3e38f956b31afa43097988bd38c4d6130270e Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Fri, 17 May 2019 16:54:48 +0300
Subject: [PATCH 23/42] Add status filter and change to size from count (#5727)

Size is a little faster query than count
---
 app/controllers/stats_controller.rb | 38 ++++++++++++++---------------
 app/models/comment.rb               |  6 ++---
 app/models/node.rb                  |  2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
index c6e4ef0f09e..43f43cc84e7 100644
--- a/app/controllers/stats_controller.rb
+++ b/app/controllers/stats_controller.rb
@@ -17,19 +17,19 @@ def range
     @end = fin
     @notes = Node.published.select(%i(created type))
       .where(type: 'note', created: @start.to_i..@end.to_i)
-      .count(:all)
-    @wikis = Revision.select(:timestamp)
+      .size
+    @wikis = Revision.published.select(:timestamp)
       .where(timestamp: @start.to_i..@end.to_i)
-      .count - @notes # because notes each have one revision
+      .size - @notes # because notes each have one revision
     @people = User.where(created_at: @start..@end).where(status: 1)
-      .count
+      .size
     @answers = Answer.where(created_at: @start..@end)
-      .count
-    @comments = Comment.select(:timestamp)
-      .where(timestamp: @start.to_i..@end.to_i)
-      .count
+      .size
+    @comments = Comment.select(:status, :timestamp)
+      .where(status: 1, timestamp: @start.to_i..@end.to_i)
+      .size
     @questions = Node.published.questions.where(created: @start.to_i..@end.to_i)
-      .count
+      .size
     @contributors = User.contributor_count_for(@start, @end)
     @popular_tags = Tag.nodes_frequency(@start, @end)
   end
@@ -41,16 +41,16 @@ def index
     end
     @title = 'Stats'
 
-    @weekly_notes = Node.past_week.select(:type).where(type: 'note').count(:all)
-    @weekly_wikis = Revision.past_week.count
-    @weekly_questions = Node.questions.past_week.count(:all).count
-    @weekly_answers = Answer.past_week.count
-    @weekly_members = User.past_week.where(status: 1).count
-    @monthly_notes = Node.past_month.select(:type).where(type: 'note').count(:all)
-    @monthly_wikis = Revision.past_month.count
-    @monthly_members = User.past_month.where(status: 1).count
-    @monthly_questions = Node.questions.past_month.count(:all).count
-    @monthly_answers = Answer.past_month.count
+    @weekly_notes = Node.past_week.select(:type).where(type: 'note').size
+    @weekly_wikis = Revision.past_week.size
+    @weekly_questions = Node.questions.past_week.size
+    @weekly_answers = Answer.past_week.size
+    @weekly_members = User.past_week.where(status: 1).size
+    @monthly_notes = Node.past_month.select(:type).where(type: 'note').size
+    @monthly_wikis = Revision.past_month.size
+    @monthly_members = User.past_month.where(status: 1).size
+    @monthly_questions = Node.questions.past_month.size
+    @monthly_answers = Answer.past_month.size
 
     @notes_per_week_period = Node.frequency('note', @start, @end).round(2)
     @edits_per_week_period = Revision.frequency(@start, @end).round(2)
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 49e947c6399..b25a5240daa 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -43,9 +43,9 @@ def self.contribution_graph_making(start = Time.now - 1.year, fin = Time.now)
       month = (fin - (week * 7 - 1).days)
       range = (fin.to_i - week.weeks.to_i)..(fin.to_i - (week - 1).weeks.to_i)
 
-      weekly_comments = Comment.select(:timestamp)
-                         .where(timestamp: range)
-                         .count
+      weekly_comments = Comment.select(:status, :timestamp)
+                         .where(status: 1, timestamp: range)
+                         .size
       date_hash[month.to_f * 1000] = weekly_comments
       week -= 1
     end
diff --git a/app/models/node.rb b/app/models/node.rb
index 2e82a08fe0b..a470525cb44 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -202,7 +202,7 @@ def self.contribution_graph_making(type = 'note', start = Time.now - 1.year, fin
       weekly_nodes = Node.published.select(:created)
                     .where(type: type,
                     created: range)
-                    .count
+                    .size
       date_hash[month.to_f * 1000] = weekly_nodes
       week -= 1
     end

From 784d254203215c148044b2d870dd6c166d80e4a9 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Fri, 17 May 2019 16:38:11 -0400
Subject: [PATCH 24/42] Update _subscribe_button.html.erb

---
 app/views/tag/_subscribe_button.html.erb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/views/tag/_subscribe_button.html.erb b/app/views/tag/_subscribe_button.html.erb
index 83ddfbc0320..d38099bcc57 100644
--- a/app/views/tag/_subscribe_button.html.erb
+++ b/app/views/tag/_subscribe_button.html.erb
@@ -9,9 +9,8 @@
   </div>
 
 <% else %>
-  <a class="btn btn-primary btn-sm sub" data-toggle="modal" data-target="#loginModal" role="button" aria-pressed="true"> 
-    Subscribe 
-    <i style="color:#ffffff;" class="fa fa-plus"></i> 
+  <a class="btn btn-default btn-sm sub" data-toggle="modal" data-target="#loginModal" role="button" aria-pressed="true"> 
+    Subscribe <i class="fa fa-plus"></i> 
   </a>
 <% end %>
 

From ddf92c982a8eea4f15e8aef3ac190bf1b94d17cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Valeria=20Garc=C3=ADa?= <valeriacobianisw@gmail.com>
Date: Sun, 19 May 2019 17:27:40 -0700
Subject: [PATCH 25/42] Fix #5516: Changed cursor to pointer on choosing main
 image. (#5611)

* Fix #5516: Changed cursor to pointer on choosing main image

* Fix#5516 Changed cursor to pointer in choose file.

* Update app/views/editor/_main_image.html.erb

Styles was updated.

Co-Authored-By: ValeriaCobianISW <valeriacobianisw@gmail.com>

* Update app/views/editor/_main_image.html.erb

Co-Authored-By: Gaurav Sachdeva <sachdeva.gaurav1997@gmail.com>

* Deleted css code about cursor pointer.
---
 app/assets/stylesheets/editor.css     | 2 +-
 app/views/editor/_main_image.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/editor.css b/app/assets/stylesheets/editor.css
index 0285df1c2cc..dc8837ad553 100644
--- a/app/assets/stylesheets/editor.css
+++ b/app/assets/stylesheets/editor.css
@@ -109,4 +109,4 @@
 #side-progress {
   margin:3px 10px 10px;
   width:30%;
-}
\ No newline at end of file
+}
diff --git a/app/views/editor/_main_image.html.erb b/app/views/editor/_main_image.html.erb
index 3aeed051b9f..300f1c5e829 100644
--- a/app/views/editor/_main_image.html.erb
+++ b/app/views/editor/_main_image.html.erb
@@ -18,7 +18,7 @@
       </span>
 
       <!-- http://stackoverflow.com/questions/11235206/twitter-bootstrap-form-file-element-upload-button -->
-      <label class="" for="side-fileinput">
+      <label style="cursor:pointer;" for="side-fileinput">
         <input id="side-fileinput" type="file" name="image[photo]" style="display:none;" />
         <a class="d-none d-md-block">choose one</a>
         <span class="d-md-none">

From dad64f052f7ea16f9ea6abc55817897307e254e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2019 09:44:05 -0400
Subject: [PATCH 26/42] Bump rubocop from 0.68.1 to 0.69.0 (#5712)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.68.1 to 0.69.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.68.1...v0.69.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 891923d6437..3a0abb2bfa6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -51,7 +51,7 @@ gem 'rb-readline'
 gem 'rdiscount', '~> 2.2', '>= 2.2.0.1'
 gem "recaptcha", require: "recaptcha/rails"
 gem 'responders', '~> 2.4'
-gem 'rubocop', '~> 0.68.1', require: false
+gem 'rubocop', '~> 0.69.0', require: false
 gem "ruby-openid", :require => "openid"
 gem 'sanitize'
 gem 'sentry-raven'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9173600c59c..1617c061a5d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -395,13 +395,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.68.1)
+    rubocop (0.69.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.6)
+      unicode-display_width (>= 1.4.0, < 1.7)
     ruby-openid (2.7.0)
     ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
@@ -488,7 +488,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.5.0)
+    unicode-display_width (1.6.0)
     unicode-emoji (2.1.0)
     virtus (1.0.5)
       axiom-types (~> 0.1)
@@ -587,7 +587,7 @@ DEPENDENCIES
   rest-client
   reverse_markdown
   rspec
-  rubocop (~> 0.68.1)
+  rubocop (~> 0.69.0)
   ruby-openid
   sanitize
   sassc-rails

From 36da815a6cde28be7e11dabfd4f6a7d9a21cb7ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2019 09:44:20 -0400
Subject: [PATCH 27/42] Bump cytoscape from 3.6.0 to 3.6.1 (#5720)

Bumps [cytoscape](https://github.com/cytoscape/cytoscape.js) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/cytoscape/cytoscape.js/releases)
- [Commits](https://github.com/cytoscape/cytoscape.js/compare/v3.6.0...v3.6.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 package.json | 2 +-
 yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index d256d6dc615..7dfa5a96e52 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "bootstrap-datepicker": "^1.6.0",
     "bootstrap-tokenfield": "^0.12.0",
     "chart.js": "^2.8.0",
-    "cytoscape": "^3.6.0",
+    "cytoscape": "^3.6.1",
     "debounce": "jywarren/debounce#patch-1",
     "file-saver": "^2.0.0",
     "font-awesome": "^4.5.0",
diff --git a/yarn.lock b/yarn.lock
index 4ef0366b76a..2b21ddab3b5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -908,9 +908,9 @@ cwise@^1.0.4, cwise@^1.0.7:
     static-module "^1.0.0"
     uglify-js "^2.6.0"
 
-cytoscape@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.6.0.tgz#396f364fa952a0d63dec63fdf876137b7609c7fe"
+cytoscape@^3.6.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.6.1.tgz#96cfc9c60b7147b043a4a47bd55bde2cc6d333eb"
   dependencies:
     heap "^0.2.6"
     lodash.debounce "^4.0.8"

From 50fa17e1de21285ede4bed540bb67303e31b3ed6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2019 09:44:50 -0400
Subject: [PATCH 28/42] Bump jbuilder from 2.8.0 to 2.9.1 (#5721)

Bumps [jbuilder](https://github.com/rails/jbuilder) from 2.8.0 to 2.9.1.
- [Release notes](https://github.com/rails/jbuilder/releases)
- [Changelog](https://github.com/rails/jbuilder/blob/v2.9.1/CHANGELOG.md)
- [Commits](https://github.com/rails/jbuilder/compare/v2.8.0...v2.9.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3a0abb2bfa6..5d8d9586415 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ gem 'grape-swagger-ui'
 gem 'http_accept_language'
 gem "i18n-js", ">= 3.0.0.rc11"
 gem 'impressionist'
-gem 'jbuilder', '~> 2.8'
+gem 'jbuilder', '~> 2.9'
 gem 'jquery-rails'
 gem 'less-rails', '~> 4.0'
 gem 'mocha', '~> 1.8'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1617c061a5d..b39fa3caac2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -185,9 +185,8 @@ GEM
       phantomjs (>= 1.9)
       railties (>= 3.2.0)
       sprockets-rails
-    jbuilder (2.8.0)
+    jbuilder (2.9.1)
       activesupport (>= 4.2.0)
-      multi_json (>= 1.2)
     jquery-atwho-rails (1.5.4)
     jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
@@ -543,7 +542,7 @@ DEPENDENCIES
   impressionist
   jasmine-jquery-rails
   jasmine-rails
-  jbuilder (~> 2.8)
+  jbuilder (~> 2.9)
   jquery-atwho-rails
   jquery-rails
   json_expressions

From f2409c36269482e615026ed9699bb6f3a8d67cd1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2019 09:45:19 -0400
Subject: [PATCH 29/42] Bump test-unit from 3.3.2 to 3.3.3 (#5701)

Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.3.2 to 3.3.3.
- [Release notes](https://github.com/test-unit/test-unit/releases)
- [Commits](https://github.com/test-unit/test-unit/compare/3.3.2...3.3.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b39fa3caac2..f15069b7402 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -456,7 +456,7 @@ GEM
       tins (~> 1.0)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    test-unit (3.3.2)
+    test-unit (3.3.3)
       power_assert
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)

From 811fa39672268e8920879ee1836ee1521be8e244 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2019 09:45:55 -0400
Subject: [PATCH 30/42] Bump selenium-webdriver from 3.142.1 to 3.142.2 (#5706)

Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.142.1 to 3.142.2.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5d8d9586415..2eb778f3fad 100644
--- a/Gemfile
+++ b/Gemfile
@@ -113,7 +113,7 @@ group :test, :development do
   gem 'rake',  '~> 12.3.2'
   gem 'rest-client'
   gem 'rspec'
-  gem 'selenium-webdriver', '~> 3.142.1'
+  gem 'selenium-webdriver', '~> 3.142.2'
   gem 'test-unit'
   gem 'teaspoon-mocha'
   gem 'timecop'
diff --git a/Gemfile.lock b/Gemfile.lock
index f15069b7402..b66248fdb56 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -420,7 +420,7 @@ GEM
       tilt
     scrypt (3.0.6)
       ffi-compiler (>= 1.0, < 2.0)
-    selenium-webdriver (3.142.1)
+    selenium-webdriver (3.142.2)
       childprocess (>= 0.5, < 2.0)
       rubyzip (~> 1.2, >= 1.2.2)
     sentry-raven (2.9.0)
@@ -591,7 +591,7 @@ DEPENDENCIES
   sanitize
   sassc-rails
   scrypt (~> 3)
-  selenium-webdriver (~> 3.142.1)
+  selenium-webdriver (~> 3.142.2)
   sentry-raven
   sidekiq
   skylight

From ef650de96d880f95f50c31fb05e9119f2138f189 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2019 09:46:13 -0400
Subject: [PATCH 31/42] Bump image-sequencer from 3.3.0 to 3.3.1 (#5636)

Bumps [image-sequencer](https://github.com/publiclab/image-sequencer) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/publiclab/image-sequencer/releases)
- [Commits](https://github.com/publiclab/image-sequencer/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 package.json |  2 +-
 yarn.lock    | 44 ++++++++++++++++++++------------------------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index 7dfa5a96e52..7b95608db4b 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "font-awesome": "^4.5.0",
     "i18n-js": "^3.2.2",
     "ics": "nwcell/ics.js#^0.2.0",
-    "image-sequencer": "^3.3.0",
+    "image-sequencer": "^3.3.1",
     "inline-markdown-editor": "^0.5.0",
     "jlouvain": "upphiminn/jLouvain#3fb3aa189b8232756c4c3f3e97aaf376debf44a7",
     "jquery": "^3.4.1",
diff --git a/yarn.lock b/yarn.lock
index 2b21ddab3b5..14e9cacef36 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -721,11 +721,7 @@ commander@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.3.0.tgz#fd430e889832ec353b9acd1de217c11cb3eef873"
 
-commander@^2.11.0, commander@^2.9.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-
-commander@~2.20.0:
+commander@^2.11.0, commander@^2.9.0, commander@~2.20.0:
   version "2.20.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
 
@@ -1935,9 +1931,9 @@ image-sequencer-invert@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/image-sequencer-invert/-/image-sequencer-invert-1.0.0.tgz#bb5c0cc2f50ed9ff4cd8d89a7929188f381a5dd4"
 
-image-sequencer@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/image-sequencer/-/image-sequencer-3.3.0.tgz#9345c42e9dc870a8d535a26560c14a125d99dfd4"
+image-sequencer@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/image-sequencer/-/image-sequencer-3.3.1.tgz#8060e959910beba8343a6ad6df553212e7bd2d8f"
   dependencies:
     bootstrap "~3.4.0"
     buffer "~5.2.1"
@@ -1955,7 +1951,7 @@ image-sequencer@^3.3.0:
     imgareaselect "git://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2"
     istanbul "^0.4.5"
     jquery "^3.3.1"
-    jsdom "^14.0.0"
+    jsdom "^15.0.0"
     jsqr "^1.1.1"
     lodash "^4.17.11"
     ndarray "^1.0.18"
@@ -2232,9 +2228,9 @@ jsdom@9.9.1:
     whatwg-url "^4.1.0"
     xml-name-validator ">= 2.0.1 < 3.0.0"
 
-jsdom@^14.0.0:
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-14.0.0.tgz#c7f1441ebcc57902d08d5fb2f6ba2baf746da7c6"
+jsdom@^15.0.0:
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-15.0.0.tgz#60cf177d79c7fa1a498453c9e2534f57e65d151f"
   dependencies:
     abab "^2.0.0"
     acorn "^6.0.4"
@@ -2246,16 +2242,16 @@ jsdom@^14.0.0:
     domexception "^1.0.1"
     escodegen "^1.11.0"
     html-encoding-sniffer "^1.0.2"
-    nwsapi "^2.0.9"
+    nwsapi "^2.1.3"
     parse5 "5.1.0"
     pn "^1.1.0"
     request "^2.88.0"
     request-promise-native "^1.0.5"
-    saxes "^3.1.5"
+    saxes "^3.1.9"
     symbol-tree "^3.2.2"
     tough-cookie "^2.5.0"
     w3c-hr-time "^1.0.1"
-    w3c-xmlserializer "^1.0.1"
+    w3c-xmlserializer "^1.1.2"
     webidl-conversions "^4.0.2"
     whatwg-encoding "^1.0.5"
     whatwg-mimetype "^2.3.0"
@@ -2832,9 +2828,9 @@ number-is-nan@^1.0.0:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
 
-nwsapi@^2.0.9:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.0.tgz#781065940aed90d9bb01ca5d0ce0fcf81c32712f"
+nwsapi@^2.1.3:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz#e006a878db23636f8e8a67d33ca0e4edf61a842f"
 
 oauth-sign@~0.3.0:
   version "0.3.0"
@@ -3504,9 +3500,9 @@ sax@^1.1.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
-saxes@^3.1.5:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.6.tgz#2d948a47b54918516c5a64096f08865deb5bd8cd"
+saxes@^3.1.9:
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.9.tgz#c1c197cd54956d88c09f960254b999e192d7058b"
   dependencies:
     xmlchars "^1.3.1"
 
@@ -4110,9 +4106,9 @@ w3c-hr-time@^1.0.1:
   dependencies:
     browser-process-hrtime "^0.1.2"
 
-w3c-xmlserializer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-1.0.1.tgz#054cdcd359dc5d1f3ec9be4e272c756af4b21d39"
+w3c-xmlserializer@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz#30485ca7d70a6fd052420a3d12fd90e6339ce794"
   dependencies:
     domexception "^1.0.1"
     webidl-conversions "^4.0.2"

From adf01931d99ba0e40e17c9f1503c11ea58712284 Mon Sep 17 00:00:00 2001
From: Monsij Biswal <biswalmonsij@gmail.com>
Date: Mon, 20 May 2019 16:47:16 +0300
Subject: [PATCH 32/42] Remove the redundant table row (#5631)

---
 app/views/wiki/revisions.html.erb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/views/wiki/revisions.html.erb b/app/views/wiki/revisions.html.erb
index e03aab5c916..b1963921369 100644
--- a/app/views/wiki/revisions.html.erb
+++ b/app/views/wiki/revisions.html.erb
@@ -11,9 +11,6 @@
     </ul>
 
     <table class="table">
-      <tr>
-        <%= raw t('wiki.revisions.table_content') %>
-      </tr>
     <% @revisions.each_with_index do |revision, index| %>
       <tr id="row<%= @node.revisions.length-1-index %>"<% if index < 2 %> class="warning"<% end %><% if revision.status == 0 %> style="background:#fcc;"<% end %>>
 

From ca44c513cf7c7700b68671529d0153490f52d85b Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Mon, 20 May 2019 15:24:04 -0400
Subject: [PATCH 33/42] Add google analytics callbacks to typeahead search (if
 GA installed) (#5748)

* Add google analytics callbacks to typeahead search (if GA installed)

* Update restful_typeahead.js
---
 app/assets/javascripts/restful_typeahead.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/restful_typeahead.js b/app/assets/javascripts/restful_typeahead.js
index fe168b40b99..b898a66a6fe 100644
--- a/app/assets/javascripts/restful_typeahead.js
+++ b/app/assets/javascripts/restful_typeahead.js
@@ -15,7 +15,12 @@ $(function() {
       source: debounce(function (query, process) {
         var encoded_query = encodeURIComponent(query);
         var qryType = $(el).attr('qryType');
-        return $.getJSON('/api/srch/' + qryType + '?query=' + encoded_query, function (data) {
+        var queryUrl = 'api/srch/' + qryType + '?query=' + encoded_query;
+        if (window.hasOwnProperty('ga')) {
+          tracker = ga.getAll()[0];
+          tracker.send("pageview", queryUrl + '&typeahead=true');
+        }
+        return $.getJSON('/' + queryUrl, function (data) {
           return process(data.items);
         },'json');
       }, 350),

From 78a67833dd939f12a1c2dbf843d4e9104d65169c Mon Sep 17 00:00:00 2001
From: Gaurav Sachdeva <sachdeva.gaurav1997@gmail.com>
Date: Tue, 21 May 2019 03:52:02 +0530
Subject: [PATCH 34/42] Translation prompt improvement (#5738)

* try

* code clean up

* en update

* conditions updated

* codeclimate error resolution

* codeclimate dig 2
---
 app/helpers/application_helper.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index cfb22883d85..688c4e3cddf 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -36,8 +36,7 @@ def emoji_names_list
   end
 
   def emoji_info
-    emoji_names = ["thumbs-up", "thumbs-down", "laugh",
-                   "hooray", "confused", "heart"]
+    emoji_names = ["thumbs-up", "thumbs-down", "laugh", "hooray", "confused", "heart"]
     emoji_image_map = {
       "thumbs-up" => "https://github.githubassets.com/images/icons/emoji/unicode/1f44d.png",
       "thumbs-down" => "https://github.githubassets.com/images/icons/emoji/unicode/1f44e.png",
@@ -107,8 +106,8 @@ def title_suggestion(comment)
       is_creator = ((defined? current_user) && current_user == Node.find(comment.nid).author) == true
       title = Regexp.last_match(1)
       output = a.render_to_string(template: "notes/_title_suggestion",
-                                  layout:   false,
-                                  locals:   {
+                                  layout: false,
+                                  locals: {
                                     user: comment.user.name,
                                     nid: comment.nid,
                                     title: title,
@@ -140,8 +139,10 @@ def current_page?(page)
 
   def translation(key, options = {})
     translated_string = t(key, options)
+    options[:fallback] = false
+    translated_string2 = t(key, options)
 
-    if translated_string.length > 3 && current_user &.has_tag('translation-helper') && !translated_string.include?("translation missing")
+    if current_user&.has_tag('translation-helper') && translated_string2.include?("translation missing") && !translated_string.include?("<")
       %(<span>#{translated_string} <a href="https://www.transifex.com/publiclab/publiclaborg/translate/#de/$?q=text%3A#{translated_string}">
           <i data-toggle='tooltip' data-placement='top' title='Needs translation? Click to help translate this text.' style='position:relative; right:2px; color:#bbb; font-size: 15px;' class='fa fa-globe'></i></a>
        </span>)

From 88032b109fd7f68b9e66ad848f7e16191f653643 Mon Sep 17 00:00:00 2001
From: Becoming A Junior <becomingajunior@gmail.com>
Date: Mon, 20 May 2019 18:49:54 -0400
Subject: [PATCH 35/42] remove dupe link to wiki on notes page (#5653)

---
 app/views/notes/index.html.erb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/views/notes/index.html.erb b/app/views/notes/index.html.erb
index 35ed6c5056e..84727f6929f 100644
--- a/app/views/notes/index.html.erb
+++ b/app/views/notes/index.html.erb
@@ -30,9 +30,6 @@
       <li class="nav-item">
         <a class="nav-link <% if params[:action] == "liked" %> active <% end %> " href="/notes/liked/"> <i class="fa fa-star-o"></i><span class="hidden-sm hidden-xs"> <%= t('notes.index.liked') %></span></a>
       </li>
-      <li class="nav-item">
-        <a class="nav-link" href="/wiki/"> <i class="fa fa-book"></i><span class="hidden-sm hidden-xs"> <%= raw t('notes.index.wiki_pages') %></span></a>
-      </li>
     </ul>
 
   <% end %>

From d0c98e201b46eb9283e687588ec835228dafb998 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Mon, 20 May 2019 19:55:06 -0400
Subject: [PATCH 36/42] Start to pinning in notes grids (work in progress)
 (#5681)

* Start to pinning in notes grids

* Update node_shared.rb

* Capybara.default_max_wait_time = 8

* Capybara.default_max_wait_time = 60

* Update node_shared_test.rb

* add pin icon

* Update node_shared_test.rb
---
 app/models/concerns/node_shared.rb |  9 ++++++++-
 app/views/grids/_nodes.html.erb    |  5 ++++-
 test/system/post_test.rb           |  9 +++------
 test/unit/node_shared_test.rb      | 13 +++++++++++++
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/app/models/concerns/node_shared.rb b/app/models/concerns/node_shared.rb
index 7cc05717cec..b15eda30149 100644
--- a/app/models/concerns/node_shared.rb
+++ b/app/models/concerns/node_shared.rb
@@ -121,10 +121,17 @@ def self.nodes_grid(body, _page = 1)
         tagname = tagname.split('!').first
       end
 
-      nodes = Node.where(status: 1).where("node.type = 'page' OR node.type = 'note'")
+      pinned = Node.where(status: 1)
+                  .where("node.type = 'page' OR node.type = 'note'")
+                  .includes(:revision, :tag)
+                  .references(:term_data, :node_revisions)
+                  .where('term_data.name = ?', "pin:#{tagname}")
+      nodes = pinned + Node.where(status: 1)
+                  .where("node.type = 'page' OR node.type = 'note'")
                   .includes(:revision, :tag)
                   .references(:term_data, :node_revisions)
                   .where('term_data.name = ?', tagname)
+                  .where.not(nid: pinned.collect(&:nid)) # don't include pinned items twice
                   .order('node_revisions.timestamp DESC')
 
       if exclude.present?
diff --git a/app/views/grids/_nodes.html.erb b/app/views/grids/_nodes.html.erb
index 66a3fbfce50..ad7c71f8571 100644
--- a/app/views/grids/_nodes.html.erb
+++ b/app/views/grids/_nodes.html.erb
@@ -9,7 +9,10 @@
   </tr>
   <% nodes.each do |node| %>
     <tr>
-      <td style="width:40%"><a href="<%= node.path %>"><%= node.latest.title %></a></td>
+      <td style="width:40%">
+        <% if node.has_tag("pinned:#{tagname}") %><i class="fa fa-thumb-tack"></i> <% end %>
+        <a href="<%= node.path %>"><%= node.latest.title %></a>
+      </td>
       <td class="author"><a href="/profile/<%= node.author.username %>">@<%= node.author.username %> <%=node.author.new_contributor %></a></td>
       <td class="updated" data-timestamp="<%= node.latest.timestamp.to_s %>"><%= distance_of_time_in_words(Time.at(node.latest.updated_at), Time.current, { include_seconds: false, scope: 'datetime.time_ago_in_words' }) %></td>
       <td class="likes"><%= node.cached_likes.to_s %></td>
diff --git a/test/system/post_test.rb b/test/system/post_test.rb
index 4d19e133bfc..8dd247d6e0f 100644
--- a/test/system/post_test.rb
+++ b/test/system/post_test.rb
@@ -2,10 +2,7 @@
 # https://guides.rubyonrails.org/testing.html#implementing-a-system-test
 
 class PostTest < ApplicationSystemTestCase
-
-  def setup
-    activate_authlogic
-  end
+  Capybara.default_max_wait_time = 60
 
   test 'posting from the editor' do
     visit '/'
@@ -17,7 +14,7 @@ def setup
 
     visit '/post'
 
-    fill_in("Title", with: "My new post", wait: 4)
+    fill_in("Title", with: "My new post")
     
     el = find(".wk-wysiwyg") # rich text input
     el.set("All about this interesting stuff")
@@ -25,7 +22,7 @@ def setup
     assert_page_reloads do
 
       find('.ple-publish').click
-      assert_selector('h1', text: "My new post", wait: 4)
+      assert_selector('h1', text: "My new post")
       assert_selector('#content', text: "All about this interesting stuff")
       assert_selector('.alert-success', text: "×\nSuccess! Thank you for contributing open research, and thanks for your patience while your post is approved by community moderators and we'll email you when it is published. In the meantime, if you have more to contribute, feel free to do so.")
       
diff --git a/test/unit/node_shared_test.rb b/test/unit/node_shared_test.rb
index 0d578b43a32..c4ae9b3fe2d 100644
--- a/test/unit/node_shared_test.rb
+++ b/test/unit/node_shared_test.rb
@@ -11,6 +11,19 @@ class NodeSharedTest < ActiveSupport::TestCase
     assert html.scan('<td class="author">').length > 1
   end
 
+  test 'that pinned notes with "pinned:foo" tags appear at the top of [nodes:foo] inline tables' do
+    before = "Here are some nodes in a table: \n\n[nodes:test] \n\nThis is how you make it work:\n\n`[nodes:tagname]`\n\n `[nodes:tagname]`\n\nMake sense?"
+    nodes(:one).add_tag('pinned:test', User.first)
+    nodes(:one).add_tag('test', User.first) # ensure it would appear anyways (although we aren't yet asserting order below, we should)
+    html = NodeShared.nodes_grid(before)
+    assert html
+    assert_equal 1, html.scan('<table class="table inline-grid nodes-grid nodes-grid-test nodes-grid-test-').length
+    assert_equal 1, html.scan('<table').length
+    assert_equal 5, html.scan('nodes-grid-test').length
+    assert_equal 2, html.scan('<td class="author">').length # but not 3 because it shouldn't appear twice
+    assert_equal 1, html.scan(nodes(:one).title).length
+  end
+
   test 'that NodeShared can be used to convert short codes like [notes:foo] into tables which list notes' do
     before = "Here are some notes in a table: \n\n[notes:test] \n\nThis is how you make it work:\n\n`[notes:tagname]`\n\n `[notes:tagname]`\n\nMake sense?"
     html = NodeShared.notes_grid(before)

From 4ac6e9adfff3523608425f37c7f635346003a40a Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Mon, 20 May 2019 20:16:01 -0400
Subject: [PATCH 37/42] fix pinning icon to "pin" instead of "pinned"

---
 app/views/grids/_nodes.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/grids/_nodes.html.erb b/app/views/grids/_nodes.html.erb
index ad7c71f8571..501d976bb4e 100644
--- a/app/views/grids/_nodes.html.erb
+++ b/app/views/grids/_nodes.html.erb
@@ -10,7 +10,7 @@
   <% nodes.each do |node| %>
     <tr>
       <td style="width:40%">
-        <% if node.has_tag("pinned:#{tagname}") %><i class="fa fa-thumb-tack"></i> <% end %>
+        <% if node.has_tag("pin:#{tagname}") %><i rel="tooltip" title="This item was pinned with the tag 'pin:<%= tagname %>'." class="fa fa-thumb-tack"></i> <% end %>
         <a href="<%= node.path %>"><%= node.latest.title %></a>
       </td>
       <td class="author"><a href="/profile/<%= node.author.username %>">@<%= node.author.username %> <%=node.author.new_contributor %></a></td>
@@ -23,7 +23,7 @@
 </table>
 <%= will_paginate @nodes, :renderer => BootstrapPagination::Rails if @paginated %>
 
-<a class="grid-embed grid-embed-<%= randomSeed %>" title="Embed this table on another site."><i class="fa fa-code" style="color:#aaa;"></i></a>
+<a class="grid-embed grid-embed-<%= randomSeed %>" rel="tooltip" title="Embed this table on another site."><i class="fa fa-code" style="color:#aaa;"></i></a>
 
 <script>
 (function(){

From d7fcbc5830ea5e85cc8898a3218b451ec4bd00b0 Mon Sep 17 00:00:00 2001
From: Lekhika Dugtal <lekhidugtal@gmail.com>
Date: Tue, 21 May 2019 18:54:46 +0530
Subject: [PATCH 38/42] horizontal cards (#5740)

---
 app/views/users/list.html.erb | 52 +++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/app/views/users/list.html.erb b/app/views/users/list.html.erb
index 9529b6c06b2..3f129d14b91 100644
--- a/app/views/users/list.html.erb
+++ b/app/views/users/list.html.erb
@@ -1,5 +1,3 @@
-<div class="container">
-<div class="row">
 <div class="col-md-6" style="font-family:Junction Regular;">
 <% if current_user && (current_user.role == "admin" || current_user.role == "moderator")%>
 <h3><%= t('users.list.user_moderation') %></h3>
@@ -23,19 +21,24 @@
     <% @users.each do |user| %>
       <div class ="col-md-6" id="user">
         <div class="card">
-           <div class="card-body">
-            <div class="profile-image text-center">
-                <img class="rounded-circle img-fluid" id="profile-photo" src="<%= user.profile_image %>" />
+           <div class="row card-body">
+            <div class="col-md-5 nopadding">
+              <div class="profile-image text-center">
+                  <img class="rounded-circle img-fluid" id="profile-photo" src="<%= user.profile_image %>" />
+              </div>
             </div>
-            <br>
-            <div class="card-info">
-            <a href="/profile/<%= user.username %>"><%= user.username %></a>
-              <div class="sub-info">
-                <div>Last Activity : <%= t = user.revisions.order(timestamp: :desc).first.try(:created_at);time_ago_in_words(t) if (t) %></div>
-                <div>History : <%= user.nodes.count %> <%= t('users.list.notes_and_edits') %></div>
-                <div> Joined : <%= distance_of_time_in_words(user.created_at, Time.current, { include_seconds: false, scope: 'datetime.time_ago_in_words' }) %></div>
+            <div class="col-md-7 nopadding">
+              <div class="card-info">
+                <a href="/profile/<%= user.username %>"><%= user.username %></a>
+                  <div class="sub-info">
+                    <div>Last Activity : <%= t = user.revisions.order(timestamp: :desc).first.try(:created_at);time_ago_in_words(t) if (t) %></div>
+                    <div>History : <%= user.nodes.count %> <%= t('users.list.notes_and_edits') %></div>
+                    <div> Joined : <%= distance_of_time_in_words(user.created_at, Time.current, { include_seconds: false, scope: 'datetime.time_ago_in_words' }) %></div>
+                  </div>
               </div>
-              <% if current_user && (current_user.role == "admin" || current_user.role == "moderator") %>
+            </div>
+            <% if current_user && (current_user.role == "admin" || current_user.role == "moderator") %>
+              <div class="col-md-12">  
                 <div style="padding-top:16px; text-align:center;">
                   <% if user.status == 0 %>
                     <i class='fa fa-ban' style="color:#a00;font-size:1em"></i> <%= t('users.list.banned') %>
@@ -43,23 +46,22 @@
                     <a class="btn btn-outline-secondary btn-sm" style="font-size:1em;" data-confirm="<%= t('users.list.are_you_sure') %>" href="/ban/<%= user.uid %>" ><i class='fa fa-ban'></i> <%= t('users.list.ban') %></a>
                   <% end %>
                 </div>
-               <% end %>
-            </div>
-            </div>
+              </div>
+            <% end %>
+
           </div>
         </div>
-      <% end %>
+      </div>
+    <% end %>
   </div>
   <%= will_paginate @users, renderer: WillPaginate::ActionView::BootstrapLinkRenderer unless @unpaginated %>
 </div>
-<div class="col-md-6 d-none d-md-block" style="margin-top:2em;">
+<div class="col-md-6 d-none d-md-block">
 <%= render :partial => "map/peopleLeaflet" , locals: {people: true , lat:23 , lon: 4} %>
 </div>
-<div class="col-md-6 d-md-none" style="margin-top:2em;">
+<div class="col-md-6 d-md-none">
 <%= render :partial => "map/peopleLeaflet" , locals: {people: true , lat:23 , lon: 4} %>
 </div>
-</div>
-</div>
 <style>
 #user {
   padding:10px 8px 10px 8px
@@ -77,6 +79,9 @@ h5 {
 
 .card-body {
   margin-bottom:0.3em;
+  margin-right: 0.1em;
+  margin-left: 0.3em;
+  padding: 0.8em;
 }
 
 .profile-image {
@@ -110,4 +115,9 @@ h5 {
     right:0;
     position:fixed;
 }
+
+.nopadding {
+   padding: 0 !important;
+   margin: 0 !important;
+}
 </style>

From 794df370264a605935483aa8d0e4946bfd14c37c Mon Sep 17 00:00:00 2001
From: Sebastian Silva <sebastian@fuentelibre.org>
Date: Tue, 21 May 2019 08:48:03 -0500
Subject: [PATCH 39/42] Trim container build process. (#5730)

* Trim container build process.

* Remove debian bundler and move phantomjs into CI

* Shorten command

* No js cache for testing

* Try yarn in .travis

* Fix yarn paths

* Setup yarn

* External start script

* Run yarn instead of bower and show log.

* Run from start.sh

* Install yarn

* Include unzip for unzipping chromedriver
---
 .travis.yml                           |  3 +-
 Dockerfile                            | 28 +++++++--------
 containers/docker-compose-testing.yml |  5 +--
 nodesource.gpg.key                    | 52 +++++++++++++++++++++++++++
 start.sh                              | 13 +++++++
 5 files changed, 81 insertions(+), 20 deletions(-)
 create mode 100644 nodesource.gpg.key
 create mode 100644 start.sh

diff --git a/.travis.yml b/.travis.yml
index 55dacb9be42..0ef174f41b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ install:
   - docker-compose build
   - docker-compose up -d
   - docker-compose exec web sleep 5
-  - docker-compose logs db
+  - docker-compose logs
   - netstat -ltpn
   - docker-compose exec web bash -c "rake db:setup"
   - docker-compose exec web bash -c "rake db:migrate"
@@ -31,6 +31,7 @@ install:
   - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then gem install danger danger-junit; fi'
 
 script:
+  - docker-compose exec web bash -c "apt install -y phantomjs"
   - docker-compose exec web bash -c "wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
   - docker-compose exec web bash -c "dpkg -i google-chrome-stable_current_amd64.deb; apt-get -fy install"
   - docker-compose exec web bash -c "wget https://chromedriver.storage.googleapis.com/74.0.3729.6/chromedriver_linux64.zip" # https://sites.google.com/a/chromium.org/chromedriver/
diff --git a/Dockerfile b/Dockerfile
index ac4ee9ab320..2055ebe7614 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,26 +6,22 @@ FROM ruby:2.4.4-stretch
 LABEL description="This image deploys Plots2."
 
 # Set correct environment variables.
-RUN mkdir -p /app
 ENV HOME /root
-ENV PHANTOMJS_VERSION 2.1.1
 
 RUN echo \
    'deb http://ftp.ca.debian.org/debian/ stretch main\n \
     deb http://ftp.ca.debian.org/debian/ stretch-updates main\n \
-    deb http://security.debian.org stretch/updates main\n' \
+    deb http://security.debian.org stretch/updates main\n \
+    deb http://deb.nodesource.com/node_8.x stretch main\n' \
     > /etc/apt/sources.list
 
 # Install dependencies
-RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-RUN apt-get update -qq && apt-get install -y build-essential bundler libmariadbclient-dev ruby-rmagick libfreeimage3 wget curl procps cron make nodejs
-RUN wget https://github.com/Medium/phantomjs/releases/download/v$PHANTOMJS_VERSION/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -O /tmp/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2; tar -xvf /tmp/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -C /opt ; cp /opt/phantomjs-$PHANTOMJS_VERSION-linux-x86_64/bin/* /usr/local/bin/
-
-# Install yarn
-RUN npm config set strict-ssl false
-RUN npm install -g yarn
-
-RUN rm -r /usr/local/bundle
+ADD nodesource.gpg.key /tmp/nodesource.gpg.key
+RUN apt-key add /tmp/nodesource.gpg.key && apt-get update -qq \
+    && apt-get install --no-install-recommends -y build-essential libmariadbclient-dev \
+                wget curl procps cron make nodejs unzip \
+                apt-transport-https libfreeimage3 \
+    && npm install -g yarn
 
 # Install bundle of gems
 WORKDIR /tmp
@@ -33,8 +29,10 @@ ADD Gemfile /tmp/Gemfile
 ADD Gemfile.lock /tmp/Gemfile.lock
 RUN bundle install --jobs=4
 
-ADD . /app
 WORKDIR /app
 
-RUN yarn install && yarn upgrade
-RUN passenger-config compile-nginx-engine --connect-timeout 60 --idle-timeout 60
+COPY Gemfile /app/Gemfile
+COPY Gemfile.lock /app/Gemfile.lock
+COPY start.sh /app/start.sh
+
+CMD [ "bash", "-l", "start.sh" ]
diff --git a/containers/docker-compose-testing.yml b/containers/docker-compose-testing.yml
index 54c3d6e7a16..95d598c27e2 100644
--- a/containers/docker-compose-testing.yml
+++ b/containers/docker-compose-testing.yml
@@ -23,7 +23,6 @@ services:
     build: ..
     cap_add:
       - SYS_PTRACE
-    command: /bin/bash -c "sleep 5 && /usr/local/bundle/bin/passenger start --max-pool-size 9 --min-instances 9 -p 4000"
     environment:
       - RAILS_ENV=${RAILS_ENV}
       - SECRET_KEY_BASE=${SECRET_KEY_BASE}
@@ -32,7 +31,6 @@ services:
       - redis
     volumes:
       - ..:/app
-      - js_libs:/app/public/lib
     restart: unless-stopped
   sidekiq:
     build: ..
@@ -47,5 +45,4 @@ services:
       - .:/app
     environment:
       - REDIS_URL=redis://redis:6379/0
-volumes:
-    js_libs:
+
diff --git a/nodesource.gpg.key b/nodesource.gpg.key
new file mode 100644
index 00000000000..1dc1d1016b7
--- /dev/null
+++ b/nodesource.gpg.key
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+Comment: GPGTools - https://gpgtools.org
+
+mQINBFObJLYBEADkFW8HMjsoYRJQ4nCYC/6Eh0yLWHWfCh+/9ZSIj4w/pOe2V6V+
+W6DHY3kK3a+2bxrax9EqKe7uxkSKf95gfns+I9+R+RJfRpb1qvljURr54y35IZgs
+fMG22Np+TmM2RLgdFCZa18h0+RbH9i0b+ZrB9XPZmLb/h9ou7SowGqQ3wwOtT3Vy
+qmif0A2GCcjFTqWW6TXaY8eZJ9BCEqW3k/0Cjw7K/mSy/utxYiUIvZNKgaG/P8U7
+89QyvxeRxAf93YFAVzMXhoKxu12IuH4VnSwAfb8gQyxKRyiGOUwk0YoBPpqRnMmD
+Dl7SdmY3oQHEJzBelTMjTM8AjbB9mWoPBX5G8t4u47/FZ6PgdfmRg9hsKXhkLJc7
+C1btblOHNgDx19fzASWX+xOjZiKpP6MkEEzq1bilUFul6RDtxkTWsTa5TGixgCB/
+G2fK8I9JL/yQhDc6OGY9mjPOxMb5PgUlT8ox3v8wt25erWj9z30QoEBwfSg4tzLc
+Jq6N/iepQemNfo6Is+TG+JzI6vhXjlsBm/Xmz0ZiFPPObAH/vGCY5I6886vXQ7ft
+qWHYHT8jz/R4tigMGC+tvZ/kcmYBsLCCI5uSEP6JJRQQhHrCvOX0UaytItfsQfLm
+EYRd2F72o1yGh3yvWWfDIBXRmaBuIGXGpajC0JyBGSOWb9UxMNZY/2LJEwARAQAB
+tB9Ob2RlU291cmNlIDxncGdAbm9kZXNvdXJjZS5jb20+iQI4BBMBAgAiBQJTmyS2
+AhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAWVaCraFdigHTmD/9OKhUy
+jJ+h8gMRg6ri5EQxOExccSRU0i7UHktecSs0DVC4lZG9AOzBe+Q36cym5Z1di6JQ
+kHl69q3zBdV3KTW+H1pdmnZlebYGz8paG9iQ/wS9gpnSeEyx0Enyi167Bzm0O4A1
+GK0prkLnz/yROHHEfHjsTgMvFwAnf9uaxwWgE1d1RitIWgJpAnp1DZ5O0uVlsPPm
+XAhuBJ32mU8S5BezPTuJJICwBlLYECGb1Y65Cil4OALU7T7sbUqfLCuaRKxuPtcU
+VnJ6/qiyPygvKZWhV6Od0Yxlyed1kftMJyYoL8kPHfeHJ+vIyt0s7cropfiwXoka
+1iJB5nKyt/eqMnPQ9aRpqkm9ABS/r7AauMA/9RALudQRHBdWIzfIg0Mlqb52yyTI
+IgQJHNGNX1T3z1XgZhI+Vi8SLFFSh8x9FeUZC6YJu0VXXj5iz+eZmk/nYjUt4Mtc
+pVsVYIB7oIDIbImODm8ggsgrIzqxOzQVP1zsCGek5U6QFc9GYrQ+Wv3/fG8hfkDn
+xXLww0OGaEQxfodm8cLFZ5b8JaG3+Yxfe7JkNclwvRimvlAjqIiW5OK0vvfHco+Y
+gANhQrlMnTx//IdZssaxvYytSHpPZTYw+qPEjbBJOLpoLrz8ZafN1uekpAqQjffI
+AOqW9SdIzq/kSHgl0bzWbPJPw86XzzftewjKNbkCDQRTmyS2ARAAxSSdQi+WpPQZ
+fOflkx9sYJa0cWzLl2w++FQnZ1Pn5F09D/kPMNh4qOsyvXWlekaV/SseDZtVziHJ
+Km6V8TBG3flmFlC3DWQfNNFwn5+pWSB8WHG4bTA5RyYEEYfpbekMtdoWW/Ro8Kmh
+41nuxZDSuBJhDeFIp0ccnN2Lp1o6XfIeDYPegyEPSSZqrudfqLrSZhStDlJgXjea
+JjW6UP6txPtYaaila9/Hn6vF87AQ5bR2dEWB/xRJzgNwRiax7KSU0xca6xAuf+TD
+xCjZ5pp2JwdCjquXLTmUnbIZ9LGV54UZ/MeiG8yVu6pxbiGnXo4Ekbk6xgi1ewLi
+vGmz4QRfVklV0dba3Zj0fRozfZ22qUHxCfDM7ad0eBXMFmHiN8hg3IUHTO+UdlX/
+aH3gADFAvSVDv0v8t6dGc6XE9Dr7mGEFnQMHO4zhM1HaS2Nh0TiL2tFLttLbfG5o
+QlxCfXX9/nasj3K9qnlEg9G3+4T7lpdPmZRRe1O8cHCI5imVg6cLIiBLPO16e0fK
+yHIgYswLdrJFfaHNYM/SWJxHpX795zn+iCwyvZSlLfH9mlegOeVmj9cyhN/VOmS3
+QRhlYXoA2z7WZTNoC6iAIlyIpMTcZr+ntaGVtFOLS6fwdBqDXjmSQu66mDKwU5Ek
+fNlbyrpzZMyFCDWEYo4AIR/18aGZBYUAEQEAAYkCHwQYAQIACQUCU5sktgIbDAAK
+CRAWVaCraFdigIPQEACcYh8rR19wMZZ/hgYv5so6Y1HcJNARuzmffQKozS/rxqec
+0xM3wceL1AIMuGhlXFeGd0wRv/RVzeZjnTGwhN1DnCDy1I66hUTgehONsfVanuP1
+PZKoL38EAxsMzdYgkYH6T9a4wJH/IPt+uuFTFFy3o8TKMvKaJk98+Jsp2X/QuNxh
+qpcIGaVbtQ1bn7m+k5Qe/fz+bFuUeXPivafLLlGc6KbdgMvSW9EVMO7yBy/2JE15
+ZJgl7lXKLQ31VQPAHT3an5IV2C/ie12eEqZWlnCiHV/wT+zhOkSpWdrheWfBT+ac
+hR4jDH80AS3F8jo3byQATJb3RoCYUCVc3u1ouhNZa5yLgYZ/iZkpk5gKjxHPudFb
+DdWjbGflN9k17VCf4Z9yAb9QMqHzHwIGXrb7ryFcuROMCLLVUp07PrTrRxnO9A/4
+xxECi0l/BzNxeU1gK88hEaNjIfviPR/h6Gq6KOcNKZ8rVFdwFpjbvwHMQBWhrqfu
+G3KaePvbnObKHXpfIKoAM7X2qfO+IFnLGTPyhFTcrl6vZBTMZTfZiC1XDQLuGUnd
+sckuXINIU3DFWzZGr0QrqkuE/jyr7FXeUJj9B7cLo+s/TXo+RaVfi3kOc9BoxIvy
+/qiNGs/TKy2/Ujqp/affmIMoMXSozKmga81JSwkADO1JMgUy6dApXz9kP4EE3g==
+=CLGF
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/start.sh b/start.sh
new file mode 100644
index 00000000000..6e5529abbed
--- /dev/null
+++ b/start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -l
+
+pidfile=/app/tmp/pids/server.pid
+
+bundle check || bundle install
+yarn
+
+if [ -f $pidfile ] ; then
+  >&2 echo 'Server PID file already exists. Removing it...';
+  rm $pidfile;
+fi
+
+bundle exec passenger start --max-pool-size 9 --min-instances 9 -p 4000

From 29281ff06afe47d45ab0e311e47645bab98c196a Mon Sep 17 00:00:00 2001
From: Lekhika Dugtal <lekhidugtal@gmail.com>
Date: Tue, 21 May 2019 21:19:30 +0530
Subject: [PATCH 40/42] fix sidebar  dropdown-menu position with bootstrap4
 (#5755)

---
 app/views/sidebar/_dashboard.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/sidebar/_dashboard.html.erb b/app/views/sidebar/_dashboard.html.erb
index cc1cc4935cf..325525ebf6d 100644
--- a/app/views/sidebar/_dashboard.html.erb
+++ b/app/views/sidebar/_dashboard.html.erb
@@ -6,7 +6,7 @@
         <span class="caret"></span>
         <span class="sr-only">Toggle Dropdown</span>
       </a>
-      <div class="dropdown-menu">
+      <div class="dropdown-menu dropdown-menu-right mt-2">
         <a class="dropdown-item" href="/post?n=15322&title=How%20to%20...&tags=activity:new,draft"><%= t('dashboard._header.dropdown.share_activity') %></a>
         <a class="dropdown-item" href="/post"><%= t('dashboard._header.dropdown.share_research_note') %></a>
         <a class="dropdown-item" href="/post?tags=question:question&template=question&redirect=question"><%= t('dashboard._header.dropdown.ask_question') %></a>

From f7b546ab424ad1bd2e00d0dec588a82e48ab0154 Mon Sep 17 00:00:00 2001
From: Lekhika Dugtal <lekhidugtal@gmail.com>
Date: Tue, 21 May 2019 21:19:54 +0530
Subject: [PATCH 41/42] fix image uplaod positions and magrin for editing
 toolbox (#5756)

---
 app/views/editor/_main_image.html.erb | 2 +-
 app/views/editor/_toolbar.html.erb    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/editor/_main_image.html.erb b/app/views/editor/_main_image.html.erb
index 300f1c5e829..c061bb564da 100644
--- a/app/views/editor/_main_image.html.erb
+++ b/app/views/editor/_main_image.html.erb
@@ -1,4 +1,4 @@
-<div class="nav col-lg-3 order-lg-2">
+<div class="col-lg-3 order-lg-2">
 
   <h3 class="d-md-none d-lg-block">Main image <i id="main-image-spinner" class="hidden icon-spinner icon-spin"></i></h3>
 
diff --git a/app/views/editor/_toolbar.html.erb b/app/views/editor/_toolbar.html.erb
index faff9be0d4c..8563195bb47 100644
--- a/app/views/editor/_toolbar.html.erb
+++ b/app/views/editor/_toolbar.html.erb
@@ -1,16 +1,16 @@
 <div class="btn-toolbar" style="margin-bottom:8px;">
 
-  <div class="btn-group">
+  <div class="btn-group mr-2 ">
     <a data-toggle="tooltip" title="Bold" data-placement="bottom" class="btn btn-outline-secondary btn-sm" onClick="$E.bold()"><i class="fa fa-bold"></i></a>
     <a data-toggle="tooltip" title="Italic" data-placement="bottom" class="btn btn-outline-secondary btn-sm" onClick="$E.italic()"><i class="fa fa-italic"></i></a>
     <a data-toggle="tooltip" title="Header" data-placement="bottom" class="btn btn-outline-secondary btn-sm" onClick="$E.h2()"><b><span class="d-md-none d-lg-inline">Header</span><span class="d-none d-md-inline d-lg-none">H</span></b></a>
   </div>
 
-  <div class="btn-group">
+  <div class="btn-group mr-2">
     <a data-toggle="tooltip" title="Make a link" data-placement="bottom" class="btn btn-outline-secondary btn-sm" href="javascript:void(0)" onClick="$E.link()"><i class="fa fa-link"></i></a>
   </div>
 
-  <div class="dropdown">
+  <div class="dropdown mr-2">
     <div class="d-md-none d-lg-inline">
       <a class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" href="#">
         Templates
@@ -24,7 +24,7 @@
     </div>
   </div>
 
-  <div class="btn-group">
+  <div class="btn-group mr-2">
     <a data-toggle="tooltip" title="Save" data-placement="bottom" onClick="$E.save()" class="btn btn-outline-secondary btn-sm"><i class="fa fa-save"></i></a>
     <a data-toggle="tooltip" title="Recover" data-placement="bottom" onClick="$E.recover()" class="btn btn-outline-secondary btn-sm">Recover</a>
   </div>

From 439d3ce4feed3fdef5323b679ed2b04c8bc93179 Mon Sep 17 00:00:00 2001
From: Lekhika Dugtal <lekhidugtal@gmail.com>
Date: Tue, 21 May 2019 21:43:41 +0530
Subject: [PATCH 42/42] Fix map position in mobile responsiveness (#5754)

---
 app/views/users/list.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/users/list.html.erb b/app/views/users/list.html.erb
index 3f129d14b91..221d7d14501 100644
--- a/app/views/users/list.html.erb
+++ b/app/views/users/list.html.erb
@@ -1,4 +1,4 @@
-<div class="col-md-6" style="font-family:Junction Regular;">
+<div class="col-md-6 order-sm-2 order-1" style="font-family:Junction Regular;">
 <% if current_user && (current_user.role == "admin" || current_user.role == "moderator")%>
 <h3><%= t('users.list.user_moderation') %></h3>
 <p><%= t('users.list.admins_ban_spam') %> </p>
@@ -56,10 +56,10 @@
   </div>
   <%= will_paginate @users, renderer: WillPaginate::ActionView::BootstrapLinkRenderer unless @unpaginated %>
 </div>
-<div class="col-md-6 d-none d-md-block">
+<div class="col-md-6 order-2 d-none d-md-block">
 <%= render :partial => "map/peopleLeaflet" , locals: {people: true , lat:23 , lon: 4} %>
 </div>
-<div class="col-md-6 d-md-none">
+<div class="col-md-6 order-sm-1 d-md-none">
 <%= render :partial => "map/peopleLeaflet" , locals: {people: true , lat:23 , lon: 4} %>
 </div>
 <style>