Merge branch 'upgrade_to_rails_4.1' into 'master'

Upgrade to rails 4.1

1 files changed, 2 insertions, 2 deletions

diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 720accd73dc..9e4409daa1a 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -34,8 +34,8 @@ class Snippet < ActiveRecord::Base
   validates :content, presence: true
 
   # Scopes
-  scope :public,  -> { where(private: false) }
-  scope :private, -> { where(private: true) }
+  scope :are_public,  -> { where(private: false) }
+  scope :are_private, -> { where(private: true) }
   scope :fresh,   -> { order("created_at DESC") }
   scope :expired, -> { where(["expires_at IS NOT NULL AND expires_at < ?", Time.current]) }
   scope :non_expired, -> { where(["expires_at IS NULL OR expires_at > ?", Time.current]) }