Merge pull request #123 from omu/develop

Merge develop into master

Gemfile.lock

@@ -114,7 +114,7 @@ GEM
     dotenv-rails (2.5.0)
       dotenv (= 2.5.0)
       railties (>= 3.2, < 6.0)
-    email_address (0.1.10)
+    email_address (0.1.11)
       netaddr (~> 2.0)
       simpleidn
     equalizer (0.0.11)
@@ -172,7 +172,7 @@ GEM
       mini_portile2 (~> 2.3.0)
     nori (2.6.0)
     orm_adapter (0.5.0)
-    pagy (0.12.0)
+    pagy (0.13.1)
     parallel (1.12.1)
     parser (2.5.1.2)
       ast (~> 2.4.0)
@@ -188,7 +188,7 @@ GEM
     pry-rails (0.3.6)
       pry (>= 0.10.4)
     public_suffix (3.0.2)
-    puma (3.11.4)
+    puma (3.12.0)
     rack (2.0.5)
     rack-protection (2.0.3)
       rack
@@ -232,7 +232,7 @@ GEM
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
-    rollbar (2.16.2)
+    rollbar (2.16.3)
       multi_json
     rubocop (0.58.1)
       jaro_winkler (~> 1.5.1)
@@ -300,7 +300,7 @@ GEM
     tilt (2.0.8)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.14)
+    uglifier (4.1.15)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext

app/models/user.rb

@@ -51,6 +51,6 @@ def accounts
   end
 
   def self.most_publishing
-    order('articles_count desc').limit(10)
+    where.not(articles_count: nil).order('articles_count desc').limit(10)
   end
 end