Skip to content

Rails 5 Compatibility #7

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

Open
wants to merge 15 commits into
base: rails4
Choose a base branch
from
Open

Rails 5 Compatibility #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9a8a4cb
Upgrade ruby version.
billygriffin Jul 26, 2016
5f812c3
Upgrade dependencies to work with Rails 5.
billygriffin Jul 26, 2016
1477dc7
Latest ruby version
billygriffin Jul 26, 2016
0e6f0ce
Use github version of inherited resources
billygriffin Jul 26, 2016
66b9d2f
Nope can't use an unreleased version in gem specs.
billygriffin Jul 26, 2016
30b5ce7
Change versioning of railties dependency
billygriffin Jul 26, 2016
3915b79
Use at least 5.0.0 for railties gem
billygriffin Jul 26, 2016
0034643
Having gem compatibility issues in Travis. Trying to lower needed has…
billygriffin Jul 26, 2016
e3f9591
Fix before filter deprecation warnings for Rails 5.
billygriffin Jul 26, 2016
5c9fb81
Add bootstrap as an import rather than require. Also add css to file …
billygriffin Jul 27, 2016
4561d0d
Update README with dependency removals
billy22g Jul 27, 2016
d8d07e8
Removed inherited_resources and has_scope
billygriffin Jul 27, 2016
d1f2062
Merge branch 'rails5' of github.com:billy22g/-deprecated-adminsimple …
billygriffin Jul 27, 2016
0e438b2
Removed require for has_scope and inherited_resources
billygriffin Jul 27, 2016
fbb27a7
Add back inherited resources and has_scope for the moment. Pushing to…
billygriffin Jul 27, 2016
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
2 changes: 1 addition & 1 deletion .rvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rvm use --create 1.9.3@adminsimple
rvm use --create 2.3.1@adminsimple
2 changes: 1 addition & 1 deletion .rvmrc.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rvm use --create 1.9.3@protoadmin
rvm use --create 2.3.1@adminsimple
7 changes: 7 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ The install generator puts a `adminsimple.rb` file into your `config/initializer
provide additional navigation as well providing the devise and simple_form configurations.


## Dependencies

We removed the [has_scope gem](https://github.com/plataformatec/has_scope) as an explicit dependency, but it can be a great tool to explicitly scope your models in admin.

We also removed inherited_resources, the behavior of which is now built into Rails through responders.


## License

Licensed under the [MIT License](http://creativecommons.org/licenses/MIT/)
Expand Down
4 changes: 1 addition & 3 deletions adminsimple.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ Gem::Specification.new do |s|
s.test_files = Dir["{spec}/**/*"]

# Runtime Dependencies
s.add_dependency 'railties', ['>= 3.2.5','< 5']
s.add_dependency 'railties', '>= 5.0.0'
s.add_dependency 'navigasmic', '>= 1.0.5'
s.add_dependency 'simple_form', '>= 2.1.0'
s.add_dependency 'inherited_resources', '>= 1.4.1'
s.add_dependency 'has_scope', '>= 0.6.0.rc'
s.add_dependency 'crummy'
end
6 changes: 1 addition & 5 deletions app/assets/stylesheets/adminsimple.sass → app/assets/stylesheets/adminsimple.css.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
/*
*= require bootstrap
*/


@import bootstrap
// mixins
@import adminsimple/mixins/mixins

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/adminsimple/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Adminsimple::ApplicationController < Adminsimple.configuration.parent_cont

layout :layout

before_filter :authenticate!, :create_body_class
before_action :authenticate!, :create_body_class

protected

Expand Down
4 changes: 2 additions & 2 deletions app/controllers/adminsimple/base_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Adminsimple::BaseController < Adminsimple::ApplicationController

respond_to :html, :js

append_before_filter :add_crumbs
append_before_action :add_crumbs

helper_method :collection_title, :resource_title, :resource_icon, :collection_action_path

Expand Down Expand Up @@ -49,7 +49,7 @@ def resource_icon
def add_crumbs
add_crumb(collection_title, collection_path)
end

def collection_action_path(action = nil, optional = nil)
arr = []
arr << action if action
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/adminsimple/devise/registrations_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class Adminsimple::Devise::RegistrationsController < Devise::RegistrationsContro

layout :layout

before_filter :authenticate!, :add_crumbs
before_action :authenticate!, :add_crumbs

private

Expand Down
2 changes: 1 addition & 1 deletion lib/adminsimple.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
require 'simple_form'
require 'navigasmic'
require 'crummy'
require 'inherited_resources'
require 'has_scope'
require 'inherited_resources'

require 'adminsimple/version'
require 'adminsimple/configuration'
Expand Down