-
Notifications
You must be signed in to change notification settings - Fork 72
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from tucq88/master
Update for Rails 5
- Loading branch information
Showing
6 changed files
with
155 additions
and
120 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
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,184 +1,196 @@ | ||
| GEM | ||
| remote: https://rubygems.org/ | ||
| remote: https://rails-assets.org/ | ||
| specs: | ||
| actionmailer (4.2.5) | ||
| actionpack (= 4.2.5) | ||
| actionview (= 4.2.5) | ||
| activejob (= 4.2.5) | ||
| actioncable (5.0.0.1) | ||
| actionpack (= 5.0.0.1) | ||
| nio4r (~> 1.2) | ||
| websocket-driver (~> 0.6.1) | ||
| actionmailer (5.0.0.1) | ||
| actionpack (= 5.0.0.1) | ||
| actionview (= 5.0.0.1) | ||
| activejob (= 5.0.0.1) | ||
| mail (~> 2.5, >= 2.5.4) | ||
| rails-dom-testing (~> 1.0, >= 1.0.5) | ||
| actionpack (4.2.5) | ||
| actionview (= 4.2.5) | ||
| activesupport (= 4.2.5) | ||
| rack (~> 1.6) | ||
| rack-test (~> 0.6.2) | ||
| rails-dom-testing (~> 1.0, >= 1.0.5) | ||
| rails-dom-testing (~> 2.0) | ||
| actionpack (5.0.0.1) | ||
| actionview (= 5.0.0.1) | ||
| activesupport (= 5.0.0.1) | ||
| rack (~> 2.0) | ||
| rack-test (~> 0.6.3) | ||
| rails-dom-testing (~> 2.0) | ||
| rails-html-sanitizer (~> 1.0, >= 1.0.2) | ||
| actionview (4.2.5) | ||
| activesupport (= 4.2.5) | ||
| actionview (5.0.0.1) | ||
| activesupport (= 5.0.0.1) | ||
| builder (~> 3.1) | ||
| erubis (~> 2.7.0) | ||
| rails-dom-testing (~> 1.0, >= 1.0.5) | ||
| rails-dom-testing (~> 2.0) | ||
| rails-html-sanitizer (~> 1.0, >= 1.0.2) | ||
| activejob (4.2.5) | ||
| activesupport (= 4.2.5) | ||
| globalid (>= 0.3.0) | ||
| activemodel (4.2.5) | ||
| activesupport (= 4.2.5) | ||
| builder (~> 3.1) | ||
| activerecord (4.2.5) | ||
| activemodel (= 4.2.5) | ||
| activesupport (= 4.2.5) | ||
| arel (~> 6.0) | ||
| activesupport (4.2.5) | ||
| activejob (5.0.0.1) | ||
| activesupport (= 5.0.0.1) | ||
| globalid (>= 0.3.6) | ||
| activemodel (5.0.0.1) | ||
| activesupport (= 5.0.0.1) | ||
| activerecord (5.0.0.1) | ||
| activemodel (= 5.0.0.1) | ||
| activesupport (= 5.0.0.1) | ||
| arel (~> 7.0) | ||
| activesupport (5.0.0.1) | ||
| concurrent-ruby (~> 1.0, >= 1.0.2) | ||
| i18n (~> 0.7) | ||
| json (~> 1.7, >= 1.7.7) | ||
| minitest (~> 5.1) | ||
| thread_safe (~> 0.3, >= 0.3.4) | ||
| tzinfo (~> 1.1) | ||
| arel (6.0.3) | ||
| autoprefixer-rails (6.1.2) | ||
| arel (7.1.4) | ||
| autoprefixer-rails (6.5.1.1) | ||
| execjs | ||
| json | ||
| better_errors (2.1.1) | ||
| coderay (>= 1.0.0) | ||
| erubis (>= 2.6.6) | ||
| rack (>= 0.9.0) | ||
| binding_of_caller (0.7.2) | ||
| debug_inspector (>= 0.0.1) | ||
| bootstrap (4.0.0.alpha2) | ||
| bootstrap (4.0.0.alpha5) | ||
| autoprefixer-rails (>= 6.0.3) | ||
| sass (>= 3.4.19) | ||
| builder (3.2.2) | ||
| byebug (8.2.1) | ||
| coderay (1.1.0) | ||
| coffee-rails (4.1.0) | ||
| byebug (9.0.6) | ||
| coderay (1.1.1) | ||
| coffee-rails (4.1.1) | ||
| coffee-script (>= 2.2.0) | ||
| railties (>= 4.0.0, < 5.0) | ||
| railties (>= 4.0.0, < 5.1.x) | ||
| coffee-script (2.4.1) | ||
| coffee-script-source | ||
| execjs | ||
| coffee-script-source (1.10.0) | ||
| concurrent-ruby (1.0.0) | ||
| concurrent-ruby (1.0.2) | ||
| debug_inspector (0.0.2) | ||
| erubis (2.7.0) | ||
| execjs (2.6.0) | ||
| font-awesome-rails (4.5.0.0) | ||
| railties (>= 3.2, < 5.0) | ||
| execjs (2.7.0) | ||
| font-awesome-rails (4.7.0.0) | ||
| railties (>= 3.2, < 5.1) | ||
| font-kit-rails (1.2.0) | ||
| rails | ||
| globalid (0.3.6) | ||
| globalid (0.3.7) | ||
| activesupport (>= 4.1.0) | ||
| i18n (0.7.0) | ||
| jbuilder (2.3.2) | ||
| activesupport (>= 3.0.0, < 5) | ||
| jbuilder (2.6.0) | ||
| activesupport (>= 3.0.0, < 5.1) | ||
| multi_json (~> 1.2) | ||
| jquery-rails (4.0.5) | ||
| rails-dom-testing (~> 1.0) | ||
| jquery-rails (4.2.1) | ||
| rails-dom-testing (>= 1, < 3) | ||
| railties (>= 4.2.0) | ||
| thor (>= 0.14, < 2.0) | ||
| json (1.8.3) | ||
| loofah (2.0.3) | ||
| nokogiri (>= 1.5.9) | ||
| mail (2.6.3) | ||
| mime-types (>= 1.16, < 3) | ||
| mime-types (2.99) | ||
| mini_portile2 (2.0.0) | ||
| minitest (5.8.3) | ||
| multi_json (1.11.2) | ||
| nokogiri (1.6.7) | ||
| mini_portile2 (~> 2.0.0.rc2) | ||
| pg (0.18.4) | ||
| quiet_assets (1.1.0) | ||
| railties (>= 3.1, < 5.0) | ||
| rack (1.6.4) | ||
| mail (2.6.4) | ||
| mime-types (>= 1.16, < 4) | ||
| method_source (0.8.2) | ||
| mime-types (3.1) | ||
| mime-types-data (~> 3.2015) | ||
| mime-types-data (3.2016.0521) | ||
| mini_portile2 (2.1.0) | ||
| minitest (5.9.1) | ||
| multi_json (1.12.1) | ||
| nio4r (1.2.1) | ||
| nokogiri (1.6.8.1) | ||
| mini_portile2 (~> 2.1.0) | ||
| pg (0.19.0) | ||
| puma (3.6.0) | ||
| rack (2.0.1) | ||
| rack-test (0.6.3) | ||
| rack (>= 1.0) | ||
| rails (4.2.5) | ||
| actionmailer (= 4.2.5) | ||
| actionpack (= 4.2.5) | ||
| actionview (= 4.2.5) | ||
| activejob (= 4.2.5) | ||
| activemodel (= 4.2.5) | ||
| activerecord (= 4.2.5) | ||
| activesupport (= 4.2.5) | ||
| rails (5.0.0.1) | ||
| actioncable (= 5.0.0.1) | ||
| actionmailer (= 5.0.0.1) | ||
| actionpack (= 5.0.0.1) | ||
| actionview (= 5.0.0.1) | ||
| activejob (= 5.0.0.1) | ||
| activemodel (= 5.0.0.1) | ||
| activerecord (= 5.0.0.1) | ||
| activesupport (= 5.0.0.1) | ||
| bundler (>= 1.3.0, < 2.0) | ||
| railties (= 4.2.5) | ||
| sprockets-rails | ||
| rails-deprecated_sanitizer (1.0.3) | ||
| activesupport (>= 4.2.0.alpha) | ||
| rails-dom-testing (1.0.7) | ||
| activesupport (>= 4.2.0.beta, < 5.0) | ||
| railties (= 5.0.0.1) | ||
| sprockets-rails (>= 2.0.0) | ||
| rails-assets-tether (1.3.7) | ||
| rails-dom-testing (2.0.1) | ||
| activesupport (>= 4.2.0, < 6.0) | ||
| nokogiri (~> 1.6.0) | ||
| rails-deprecated_sanitizer (>= 1.0.1) | ||
| rails-html-sanitizer (1.0.2) | ||
| rails-html-sanitizer (1.0.3) | ||
| loofah (~> 2.0) | ||
| railties (4.2.5) | ||
| actionpack (= 4.2.5) | ||
| activesupport (= 4.2.5) | ||
| railties (5.0.0.1) | ||
| actionpack (= 5.0.0.1) | ||
| activesupport (= 5.0.0.1) | ||
| method_source | ||
| rake (>= 0.8.7) | ||
| thor (>= 0.18.1, < 2.0) | ||
| rake (10.4.2) | ||
| rdoc (4.2.0) | ||
| sass (3.4.19) | ||
| sass-rails (5.0.4) | ||
| railties (>= 4.0.0, < 5.0) | ||
| rake (11.3.0) | ||
| rdoc (4.2.2) | ||
| json (~> 1.4) | ||
| sass (3.4.22) | ||
| sass-rails (5.0.6) | ||
| railties (>= 4.0.0, < 6) | ||
| sass (~> 3.1) | ||
| sprockets (>= 2.8, < 4.0) | ||
| sprockets-rails (>= 2.0, < 4.0) | ||
| tilt (>= 1.1, < 3) | ||
| sdoc (0.4.1) | ||
| sdoc (0.4.2) | ||
| json (~> 1.7, >= 1.7.7) | ||
| rdoc (~> 4.0) | ||
| simple_form (3.2.0) | ||
| actionpack (~> 4.0) | ||
| activemodel (~> 4.0) | ||
| spring (1.5.0) | ||
| sprockets (3.5.1) | ||
| simple_form (3.3.1) | ||
| actionpack (> 4, < 5.1) | ||
| activemodel (> 4, < 5.1) | ||
| spring (2.0.0) | ||
| activesupport (>= 4.2) | ||
| sprockets (3.7.0) | ||
| concurrent-ruby (~> 1.0) | ||
| rack (> 1, < 3) | ||
| sprockets-rails (2.3.3) | ||
| actionpack (>= 3.0) | ||
| activesupport (>= 3.0) | ||
| sprockets (>= 2.8, < 4.0) | ||
| sprockets-rails (3.2.0) | ||
| actionpack (>= 4.0) | ||
| activesupport (>= 4.0) | ||
| sprockets (>= 3.0.0) | ||
| thor (0.19.1) | ||
| thread_safe (0.3.5) | ||
| tilt (2.0.1) | ||
| turbolinks (2.5.3) | ||
| coffee-rails | ||
| tilt (2.0.5) | ||
| turbolinks (5.0.1) | ||
| turbolinks-source (~> 5) | ||
| turbolinks-source (5.0.0) | ||
| tzinfo (1.2.2) | ||
| thread_safe (~> 0.1) | ||
| uglifier (2.7.2) | ||
| execjs (>= 0.3.0) | ||
| json (>= 1.8.0) | ||
| web-console (2.2.1) | ||
| activemodel (>= 4.0) | ||
| binding_of_caller (>= 0.7.2) | ||
| railties (>= 4.0) | ||
| sprockets-rails (>= 2.0, < 4.0) | ||
| uglifier (3.0.3) | ||
| execjs (>= 0.3.0, < 3) | ||
| web-console (3.3.1) | ||
| actionview (>= 5.0) | ||
| activemodel (>= 5.0) | ||
| debug_inspector | ||
| railties (>= 5.0) | ||
| websocket-driver (0.6.4) | ||
| websocket-extensions (>= 0.1.0) | ||
| websocket-extensions (0.1.2) | ||
|
|
||
| PLATFORMS | ||
| ruby | ||
|
|
||
| DEPENDENCIES | ||
| better_errors | ||
| bootstrap (~> 4.0.0.alpha1) | ||
| bootstrap (~> 4.0.0.alpha5) | ||
| byebug | ||
| coffee-rails (~> 4.1.0) | ||
| font-awesome-rails | ||
| font-kit-rails (~> 1.2.0) | ||
| jbuilder (~> 2.0) | ||
| jbuilder (~> 2.5) | ||
| jquery-rails | ||
| pg | ||
| quiet_assets | ||
| rails (= 4.2.5) | ||
| pg (~> 0.18) | ||
| puma (~> 3.0) | ||
| rails (~> 5.0.0, >= 5.0.0.1) | ||
| rails-assets-tether (>= 1.1.0)! | ||
| sass-rails (~> 5.0) | ||
| sdoc (~> 0.4.0) | ||
| simple_form | ||
| spring | ||
| turbolinks | ||
| turbolinks (~> 5) | ||
| uglifier (>= 1.3.0) | ||
| web-console (~> 2.0) | ||
| web-console | ||
|
|
||
| RUBY VERSION | ||
| ruby 2.3.1p112 | ||
|
|
||
| BUNDLED WITH | ||
| 1.11.2 | ||
| 1.13.5 |
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,3 +1,14 @@ | ||
| ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) | ||
|
|
||
| require 'bundler/setup' # Set up gems listed in the Gemfile. | ||
|
|
||
| # Custom for rails server | ||
| require 'rails/commands/server' | ||
| module Rails | ||
| class Server | ||
| alias :default_options_bk :default_options | ||
| def default_options | ||
| default_options_bk.merge!(Host: '0.0.0.0') | ||
| end | ||
| end | ||
| end |
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
Oops, something went wrong.