Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

issue 2310 first time commit #2363

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
ansi (1.5.0)
arel (5.0.1.20140414130214)
ast (2.3.0)
ast (2.4.0)
authlogic (3.5.0)
activerecord (>= 3.2, < 5.1)
activesupport (>= 3.2, < 5.1)
Expand All @@ -50,7 +50,7 @@ GEM
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
builder (3.2.3)
byebug (9.1.0)
byebug (10.0.0)
ci_reporter (2.0.0)
builder (>= 2.1.2)
ci_reporter_test_unit (1.0.1)
Expand Down Expand Up @@ -87,7 +87,7 @@ GEM
equalizer (0.0.11)
erubis (2.7.0)
execjs (2.7.0)
ffi (1.9.18)
ffi (1.9.21)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
Expand All @@ -109,8 +109,8 @@ GEM
rack (>= 1.3.0)
rack-accept
virtus (>= 1.0.0)
grape-entity (0.6.0)
activesupport
grape-entity (0.7.1)
activesupport (>= 4.0)
multi_json (>= 1.3.2)
grape-swagger (0.25.3)
grape (>= 0.12.0)
Expand All @@ -127,14 +127,14 @@ GEM
http-cookie (1.0.3)
domain_name (~> 0.5)
http_accept_language (2.1.1)
i18n (0.9.1)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
i18n-js (3.0.3)
i18n-js (3.0.4)
i18n (~> 0.6, >= 0.6.6)
ice_nine (0.11.2)
impressionist (1.6.0)
nokogiri (~> 1)
jasmine-core (2.8.0)
jasmine-core (2.99.2)
jasmine-jquery-rails (2.0.3)
jasmine-rails (0.14.7)
jasmine-core (>= 1.3, < 3.0)
Expand Down Expand Up @@ -169,7 +169,7 @@ GEM
mime-types-data (3.2016.0521)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.1)
minitest (5.11.3)
minitest-reporters (1.1.19)
ansi
builder
Expand All @@ -186,7 +186,7 @@ GEM
mysql2 (0.3.21)
netrc (0.11.0)
nifty-generators (0.4.6)
nokogiri (1.8.1)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
options (2.3.2)
paperclip (4.2.4)
Expand All @@ -195,21 +195,21 @@ GEM
cocaine (~> 0.5.5)
mime-types
parallel (1.12.1)
parser (2.4.0.2)
ast (~> 2.3)
passenger (5.1.12)
parser (2.5.0.0)
ast (~> 2.4.0)
passenger (5.2.0)
rack
rake (>= 0.8.1)
phantomjs (2.1.1.0)
php-serialize (1.2.0)
power_assert (1.1.1)
powerpack (0.1.1)
progress_bar (1.1.0)
progress_bar (1.2.0)
highline (~> 1.6)
options (~> 2.3.0)
protected_attributes (1.1.4)
activemodel (>= 4.0.1, < 5.0)
public_suffix (3.0.1)
public_suffix (3.0.2)
rack (1.5.5)
rack-accept (0.4.5)
rack (>= 0.4)
Expand Down Expand Up @@ -244,7 +244,7 @@ GEM
rake (10.5.0)
rb-readline (0.5.5)
rdiscount (2.2.0.1)
recaptcha (4.6.3)
recaptcha (4.6.4)
json
ref (2.0.0)
request_store (1.4.0)
Expand All @@ -265,7 +265,7 @@ GEM
rspec-mocks (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.0)
rspec-support (3.7.1)
rubocop (0.52.1)
parallel (~> 1.10)
parser (>= 2.4.0.2, < 3.0)
Expand Down Expand Up @@ -314,13 +314,13 @@ GEM
turbolinks (5.1.0)
turbolinks-source (~> 5.1)
turbolinks-source (5.1.0)
tzinfo (1.2.4)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.3)
uglifier (4.1.6)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.4)
unf_ext (0.0.7.5)
unicode-display_width (1.3.0)
virtus (1.0.5)
axiom-types (~> 0.1)
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/wiki_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ def liked
@title = I18n.t('wiki_controller.well_liked_wiki_pages')
@wikis = Node.limit(40)
.order('node.cached_likes DESC')
.where("status = 1 AND nid != 259 AND (type = 'page' OR type = 'tool' OR type = 'place') AND cached_likes > 0")
.where("status = 1 AND nid != 259 AND (type = 'page' OR type = 'tool' OR type = 'place') AND cached_likes >= 0")
render template: 'wiki/index'
end

Expand Down