Skip to content

Fix installation for gem #130

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.

Sign up for GitHub

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

Closed
wants to merge 8 commits into from
Closed

Fix installation for gem #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
61507ee
Merge pull request #3 from activeadmin/master
xfynx Sep 3, 2018
9b8845b
freeze ransack version
Sep 3, 2018
60c5907
fix rails dep
Sep 3, 2018
38bcfe3
+ freeze ransack version upto 1.8.6
Sep 3, 2018
bda1fc7
Merge branch 'master' of https://github.com/xfynx/activeadmin-mongoid
Sep 3, 2018
af51995
+ freeze ransack version upto 1.8.6
Sep 3, 2018
96b103a
Merge branch 'master' into fix-installation
xfynx Dec 10, 2018
5c4332c
explicit ransack declaration isn't required
xfynx Dec 10, 2018
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
3 changes: 1 addition & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ source 'https://rubygems.org'
# development dependencies will be added by default to the :development group.
gemspec

gem 'ransack', github: 'activerecord-hackery/ransack'
gem 'ransack-mongoid', github: 'activerecord-hackery/ransack-mongoid'

# Test app stuff

gem 'rails', '~> 5.1'
gem 'rails', '< 5.2' # ransack newer than 1.8.6 causes problems in rails 5.2+
gem 'kaminari', '~> 1.0'
gem 'kaminari-mongoid'

Expand Down
2 changes: 2 additions & 0 deletions activeadmin-mongoid.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ Gem::Specification.new do |gem|
gem.license = 'MIT'

gem.add_runtime_dependency 'mongoid', ['~> 6.0']
gem.add_runtime_dependency 'kaminari-mongoid'
gem.add_runtime_dependency 'activeadmin', '>= 1.3.0'
gem.add_runtime_dependency 'ransack', '<= 1.8.6' # ransack newer than this requiring active_record
gem.add_runtime_dependency 'jquery-rails'
gem.add_runtime_dependency 'sass-rails', ['>= 3.1.4']

Expand Down
2 changes: 1 addition & 1 deletion lib/active_admin/mongoid/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module ActiveAdmin
module Mongoid
VERSION = '0.7.0'
VERSION = '0.7.1'
end
end
4 changes: 2 additions & 2 deletions test_app/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ gem 'activeadmin', '~> 1.3.0'

# Test app stuff

gem 'rails', '~> 5.1.6'
gem 'rails', '< 5.2'

gem 'pry'

Expand All @@ -14,7 +14,7 @@ gem 'devise'
gem 'mongoid', '~> 6.0.3', require: true
gem 'kaminari', '~> 1.0'
gem 'kaminari-mongoid'
gem 'ransack', '< 1.8.7'
gem 'ransack', '<= 1.8.6'

gem 'sprockets', '>= 3.7.2'

Expand Down
5 changes: 3 additions & 2 deletions test_app/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
PATH
remote: ..
specs:
activeadmin-mongoid (0.6.0)
activeadmin-mongoid (0.7.0)
activeadmin (>= 1.3.0)
jquery-rails
mongoid (~> 6.0)
ransack (<= 1.8.6)
sass-rails (>= 3.1.4)

GEM
Expand Down Expand Up @@ -262,7 +263,7 @@ DEPENDENCIES
poltergeist
pry
rails (~> 5.1.6)
ransack (< 1.8.7)
ransack (<= 1.8.6)
sass-rails
simplecov
sprockets (>= 3.7.2)
Expand Down