Skip to content

Commit

Permalink
reformatted previous commit
Browse files Browse the repository at this point in the history
  • Loading branch information
17sushmita committed Jul 22, 2021
1 parent 5c79a7e commit 4dbe8b2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ gem 'twitter'
gem 'jquery-datatables'

# run with `bundle install --without production` or `bundle install --without mysql` to exclude this
group :mysql, :production do
gem 'mysql2', '>= 0.4.4'
group :mysql, :development do
gem 'mysql2', '~> 0.5.3'
# mysql 0.4.3+ causes a version mismatch, apparently, and demands 'activerecord-mysql2-adapter'
end

Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ DEPENDENCIES
minitest-reporters (~> 1.4.3)
mocha (~> 1.13)
mustermann (= 1.1.1)
mysql2 (>= 0.4.4)
mysql2 (~> 0.5.3)
nifty-generators
omniauth (~> 1.9)
omniauth-facebook (~> 8.0)
Expand Down
2 changes: 0 additions & 2 deletions app/services/search_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,8 @@ def tagNearbyPeople(coordinates, tag, field, period = nil, sort_by = nil, order_
items = user_locations

# selects the items whose node_tags don't have the location:blurred tag

items = items.where('user_tags.value <> "location:blurred"')


# Here we use period["from"] and period["to"] in the query only if they have been specified,
# so we avoid to join revision table
if !period["from"].nil? || !period["to"].nil?
Expand Down

0 comments on commit 4dbe8b2

Please sign in to comment.