forked from Sology/smart_listing
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'sology/master'
* sology/master: Version bump. Remove duplicated href key from config template. Closes Sology#146 Replace deprecated .any? with .present?. Closes Sology#143 Update Dummy and Dev Environment to Rails 5.1. Closes Sology#140 Fix sanitize_params method. Closes Sology#137 Enable to configure global remote option. Closes Sology#131 Kaminari update. Closes Sology#139 Update Readme for Rails >= 5.1 Users Version bump. Fix indentation. Closes Sology#130 Use #empty? for AC::Params. Closes Sology#122 Add support for Turbolinks 5. Closes Sology#117 Fix Kaminari #num_pages deprecation warning. Closes Sology#115 Allow boostrap 4 compatibility. Closes Sology#114 Use id.to_json so integers and uuids will both work. Closes Sology#113 Fixing documentation for filter search icon to be displayed correctly. Allow to render outside of controllers. Closes Sology#106 Update Gemfile.lock Version bump to 1.2.0 Fix handling view arguments.
- Loading branch information
Showing
41 changed files
with
766 additions
and
302 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,3 +30,5 @@ spec/dummy/db/*.sqlite3 | |
| spec/dummy/log/*.log | ||
| spec/dummy/tmp/ | ||
| tags | ||
|
|
||
| .byebug_history | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,149 +1,231 @@ | ||
| PATH | ||
| remote: . | ||
| specs: | ||
| smart_listing (1.1.2) | ||
| smart_listing (1.2.1) | ||
| coffee-rails | ||
| jquery-rails | ||
| kaminari (~> 0.17) | ||
| kaminari (>= 0.17) | ||
| rails (>= 3.2) | ||
|
|
||
| GEM | ||
| remote: https://rubygems.org/ | ||
| specs: | ||
| actionmailer (4.1.6) | ||
| actionpack (= 4.1.6) | ||
| actionview (= 4.1.6) | ||
| actioncable (5.1.4) | ||
| actionpack (= 5.1.4) | ||
| nio4r (~> 2.0) | ||
| websocket-driver (~> 0.6.1) | ||
| actionmailer (5.1.4) | ||
| actionpack (= 5.1.4) | ||
| actionview (= 5.1.4) | ||
| activejob (= 5.1.4) | ||
| mail (~> 2.5, >= 2.5.4) | ||
| actionpack (4.1.6) | ||
| actionview (= 4.1.6) | ||
| activesupport (= 4.1.6) | ||
| rack (~> 1.5.2) | ||
| rack-test (~> 0.6.2) | ||
| actionview (4.1.6) | ||
| activesupport (= 4.1.6) | ||
| rails-dom-testing (~> 2.0) | ||
| actionpack (5.1.4) | ||
| actionview (= 5.1.4) | ||
| activesupport (= 5.1.4) | ||
| rack (~> 2.0) | ||
| rack-test (>= 0.6.3) | ||
| rails-dom-testing (~> 2.0) | ||
| rails-html-sanitizer (~> 1.0, >= 1.0.2) | ||
| actionview (5.1.4) | ||
| activesupport (= 5.1.4) | ||
| builder (~> 3.1) | ||
| erubis (~> 2.7.0) | ||
| activemodel (4.1.6) | ||
| activesupport (= 4.1.6) | ||
| builder (~> 3.1) | ||
| activerecord (4.1.6) | ||
| activemodel (= 4.1.6) | ||
| activesupport (= 4.1.6) | ||
| arel (~> 5.0.0) | ||
| activesupport (4.1.6) | ||
| i18n (~> 0.6, >= 0.6.9) | ||
| json (~> 1.7, >= 1.7.7) | ||
| erubi (~> 1.4) | ||
| rails-dom-testing (~> 2.0) | ||
| rails-html-sanitizer (~> 1.0, >= 1.0.3) | ||
| activejob (5.1.4) | ||
| activesupport (= 5.1.4) | ||
| globalid (>= 0.3.6) | ||
| activemodel (5.1.4) | ||
| activesupport (= 5.1.4) | ||
| activerecord (5.1.4) | ||
| activemodel (= 5.1.4) | ||
| activesupport (= 5.1.4) | ||
| arel (~> 8.0) | ||
| activesupport (5.1.4) | ||
| concurrent-ruby (~> 1.0, >= 1.0.2) | ||
| i18n (~> 0.7) | ||
| minitest (~> 5.1) | ||
| thread_safe (~> 0.1) | ||
| tzinfo (~> 1.1) | ||
| arel (5.0.1.20140414130214) | ||
| bootstrap-sass (3.3.0.1) | ||
| sass (~> 3.2) | ||
| builder (3.2.2) | ||
| capybara (2.4.4) | ||
| addressable (2.5.2) | ||
| public_suffix (>= 2.0.2, < 4.0) | ||
| arel (8.0.0) | ||
| autoprefixer-rails (7.2.5) | ||
| execjs | ||
| bootstrap-sass (3.3.7) | ||
| autoprefixer-rails (>= 5.2.1) | ||
| sass (>= 3.3.4) | ||
| builder (3.2.3) | ||
| byebug (9.1.0) | ||
| capybara (2.13.0) | ||
| addressable | ||
| mime-types (>= 1.16) | ||
| nokogiri (>= 1.3.3) | ||
| rack (>= 1.0.0) | ||
| rack-test (>= 0.5.4) | ||
| xpath (~> 2.0) | ||
| capybara-webkit (1.3.1) | ||
| capybara (>= 2.0.2, < 2.5.0) | ||
| capybara-webkit (1.14.0) | ||
| capybara (>= 2.3.0, < 2.14.0) | ||
| json | ||
| coffee-rails (4.1.0) | ||
| coderay (1.1.2) | ||
| coffee-rails (4.2.2) | ||
| coffee-script (>= 2.2.0) | ||
| railties (>= 4.0.0, < 5.0) | ||
| coffee-script (2.3.0) | ||
| railties (>= 4.0.0) | ||
| coffee-script (2.4.1) | ||
| coffee-script-source | ||
| execjs | ||
| coffee-script-source (1.8.0) | ||
| database_cleaner (1.3.0) | ||
| diff-lcs (1.2.5) | ||
| erubis (2.7.0) | ||
| execjs (2.2.2) | ||
| hike (1.2.3) | ||
| i18n (0.6.11) | ||
| jquery-rails (3.1.2) | ||
| railties (>= 3.0, < 5.0) | ||
| coffee-script-source (1.12.2) | ||
| concurrent-ruby (1.0.5) | ||
| crass (1.0.3) | ||
| database_cleaner (1.6.2) | ||
| diff-lcs (1.3) | ||
| erubi (1.7.0) | ||
| execjs (2.7.0) | ||
| ffi (1.9.18) | ||
| formatador (0.2.5) | ||
| globalid (0.4.1) | ||
| activesupport (>= 4.2.0) | ||
| guard (2.14.2) | ||
| formatador (>= 0.2.4) | ||
| listen (>= 2.7, < 4.0) | ||
| lumberjack (>= 1.0.12, < 2.0) | ||
| nenv (~> 0.1) | ||
| notiffany (~> 0.0) | ||
| pry (>= 0.9.12) | ||
| shellany (~> 0.0) | ||
| thor (>= 0.18.1) | ||
| guard-compat (1.2.1) | ||
| guard-rspec (4.7.3) | ||
| guard (~> 2.1) | ||
| guard-compat (~> 1.1) | ||
| rspec (>= 2.99.0, < 4.0) | ||
| i18n (0.9.3) | ||
| concurrent-ruby (~> 1.0) | ||
| jquery-rails (4.3.1) | ||
| rails-dom-testing (>= 1, < 3) | ||
| railties (>= 4.2.0) | ||
| thor (>= 0.14, < 2.0) | ||
| json (1.8.1) | ||
| json (2.1.0) | ||
| kaminari (0.17.0) | ||
| actionpack (>= 3.0.0) | ||
| activesupport (>= 3.0.0) | ||
| mail (2.6.3) | ||
| mime-types (>= 1.16, < 3) | ||
| mime-types (2.4.3) | ||
| mini_portile2 (2.1.0) | ||
| minitest (5.4.2) | ||
| multi_json (1.10.1) | ||
| nokogiri (1.6.8) | ||
| mini_portile2 (~> 2.1.0) | ||
| pkg-config (~> 1.1.7) | ||
| pkg-config (1.1.7) | ||
| rack (1.5.2) | ||
| rack-test (0.6.2) | ||
| rack (>= 1.0) | ||
| rails (4.1.6) | ||
| actionmailer (= 4.1.6) | ||
| actionpack (= 4.1.6) | ||
| actionview (= 4.1.6) | ||
| activemodel (= 4.1.6) | ||
| activerecord (= 4.1.6) | ||
| activesupport (= 4.1.6) | ||
| bundler (>= 1.3.0, < 2.0) | ||
| railties (= 4.1.6) | ||
| sprockets-rails (~> 2.0) | ||
| railties (4.1.6) | ||
| actionpack (= 4.1.6) | ||
| activesupport (= 4.1.6) | ||
| listen (3.1.5) | ||
| rb-fsevent (~> 0.9, >= 0.9.4) | ||
| rb-inotify (~> 0.9, >= 0.9.7) | ||
| ruby_dep (~> 1.2) | ||
| loofah (2.1.1) | ||
| crass (~> 1.0.2) | ||
| nokogiri (>= 1.5.9) | ||
| lumberjack (1.0.12) | ||
| mail (2.7.0) | ||
| mini_mime (>= 0.1.1) | ||
| method_source (0.9.0) | ||
| mime-types (3.1) | ||
| mime-types-data (~> 3.2015) | ||
| mime-types-data (3.2016.0521) | ||
| mini_mime (1.0.0) | ||
| mini_portile2 (2.3.0) | ||
| minitest (5.11.2) | ||
| nenv (0.3.0) | ||
| nio4r (2.2.0) | ||
| nokogiri (1.8.1) | ||
| mini_portile2 (~> 2.3.0) | ||
| notiffany (0.1.1) | ||
| nenv (~> 0.1) | ||
| shellany (~> 0.0) | ||
| pry (0.11.3) | ||
| coderay (~> 1.1.0) | ||
| method_source (~> 0.9.0) | ||
| public_suffix (3.0.1) | ||
| rack (2.0.3) | ||
| rack-test (0.8.2) | ||
| rack (>= 1.0, < 3) | ||
| rails (5.1.4) | ||
| actioncable (= 5.1.4) | ||
| actionmailer (= 5.1.4) | ||
| actionpack (= 5.1.4) | ||
| actionview (= 5.1.4) | ||
| activejob (= 5.1.4) | ||
| activemodel (= 5.1.4) | ||
| activerecord (= 5.1.4) | ||
| activesupport (= 5.1.4) | ||
| bundler (>= 1.3.0) | ||
| railties (= 5.1.4) | ||
| sprockets-rails (>= 2.0.0) | ||
| rails-dom-testing (2.0.3) | ||
| activesupport (>= 4.2.0) | ||
| nokogiri (>= 1.6) | ||
| rails-html-sanitizer (1.0.3) | ||
| loofah (~> 2.0) | ||
| railties (5.1.4) | ||
| actionpack (= 5.1.4) | ||
| activesupport (= 5.1.4) | ||
| method_source | ||
| rake (>= 0.8.7) | ||
| thor (>= 0.18.1, < 2.0) | ||
| rake (10.3.2) | ||
| rspec-core (3.1.7) | ||
| rspec-support (~> 3.1.0) | ||
| rspec-expectations (3.1.2) | ||
| rake (12.3.0) | ||
| rb-fsevent (0.10.2) | ||
| rb-inotify (0.9.10) | ||
| ffi (>= 0.5.0, < 2) | ||
| rspec (3.7.0) | ||
| rspec-core (~> 3.7.0) | ||
| rspec-expectations (~> 3.7.0) | ||
| rspec-mocks (~> 3.7.0) | ||
| rspec-core (3.7.1) | ||
| rspec-support (~> 3.7.0) | ||
| rspec-expectations (3.7.0) | ||
| diff-lcs (>= 1.2.0, < 2.0) | ||
| rspec-support (~> 3.1.0) | ||
| rspec-mocks (3.1.3) | ||
| rspec-support (~> 3.1.0) | ||
| rspec-rails (3.1.0) | ||
| rspec-support (~> 3.7.0) | ||
| rspec-mocks (3.7.0) | ||
| diff-lcs (>= 1.2.0, < 2.0) | ||
| rspec-support (~> 3.7.0) | ||
| rspec-rails (3.7.2) | ||
| actionpack (>= 3.0) | ||
| activesupport (>= 3.0) | ||
| railties (>= 3.0) | ||
| rspec-core (~> 3.1.0) | ||
| rspec-expectations (~> 3.1.0) | ||
| rspec-mocks (~> 3.1.0) | ||
| rspec-support (~> 3.1.0) | ||
| rspec-support (3.1.2) | ||
| sass (3.4.7) | ||
| sprockets (2.12.3) | ||
| hike (~> 1.2) | ||
| multi_json (~> 1.0) | ||
| rack (~> 1.0) | ||
| tilt (~> 1.1, != 1.3.0) | ||
| sprockets-rails (2.2.0) | ||
| actionpack (>= 3.0) | ||
| activesupport (>= 3.0) | ||
| sprockets (>= 2.8, < 4.0) | ||
| sqlite3 (1.3.9) | ||
| thor (0.19.1) | ||
| thread_safe (0.3.4) | ||
| tilt (1.4.1) | ||
| tzinfo (1.2.2) | ||
| rspec-core (~> 3.7.0) | ||
| rspec-expectations (~> 3.7.0) | ||
| rspec-mocks (~> 3.7.0) | ||
| rspec-support (~> 3.7.0) | ||
| rspec-support (3.7.0) | ||
| ruby_dep (1.5.0) | ||
| sass (3.5.5) | ||
| sass-listen (~> 4.0.0) | ||
| sass-listen (4.0.0) | ||
| rb-fsevent (~> 0.9, >= 0.9.4) | ||
| rb-inotify (~> 0.9, >= 0.9.7) | ||
| shellany (0.0.1) | ||
| sprockets (3.7.1) | ||
| concurrent-ruby (~> 1.0) | ||
| rack (> 1, < 3) | ||
| sprockets-rails (3.2.1) | ||
| actionpack (>= 4.0) | ||
| activesupport (>= 4.0) | ||
| sprockets (>= 3.0.0) | ||
| sqlite3 (1.3.13) | ||
| thor (0.20.0) | ||
| thread_safe (0.3.6) | ||
| tzinfo (1.2.4) | ||
| thread_safe (~> 0.1) | ||
| xpath (2.0.0) | ||
| websocket-driver (0.6.5) | ||
| websocket-extensions (>= 0.1.0) | ||
| websocket-extensions (0.1.3) | ||
| xpath (2.1.0) | ||
| nokogiri (~> 1.3) | ||
|
|
||
| PLATFORMS | ||
| ruby | ||
|
|
||
| DEPENDENCIES | ||
| bootstrap-sass | ||
| capybara (~> 2.4.4) | ||
| capybara-webkit (~> 1.3.1) | ||
| byebug | ||
| capybara (< 2.14) | ||
| capybara-webkit (~> 1.14) | ||
| database_cleaner | ||
| guard-rspec | ||
| rspec-rails | ||
| smart_listing! | ||
| sqlite3 | ||
|
|
||
| BUNDLED WITH | ||
| 1.12.5 | ||
| 1.16.1 |
Oops, something went wrong.