diff --git a/CUSTOMIZE.md b/CUSTOMIZE.md index 426ada54a..a7b5a7566 100644 --- a/CUSTOMIZE.md +++ b/CUSTOMIZE.md @@ -5,7 +5,7 @@ Make sure you've [installed](https://github.com/codeforamerica/ohana-web-search/ ## Environment variables Inside the `config` folder, you will find a file named `application.yml`. Read through the documentation to learn how you can customize the app to suit -your needs. +your needs, including pointing the app to your own instance of Ohana API. If you're planning on deploying the app to Heroku, you can set all the required environment variables in production by running the following command: diff --git a/Gemfile b/Gemfile index f68e45ce6..5e64a0210 100644 --- a/Gemfile +++ b/Gemfile @@ -18,7 +18,7 @@ gem 'font-awesome-rails' gem 'uglifier' # For enabling requirejs-style AMD scripts in the asset pipeline. -gem 'requirejs-rails', '= 0.9.5' +gem 'requirejs-rails' # For HAML HTML view templates. gem 'haml-rails' diff --git a/Gemfile.lock b/Gemfile.lock index b48ccefba..7bfed6e5d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,36 +1,36 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.1) - actionpack (= 4.2.1) - actionview (= 4.2.1) - activejob (= 4.2.1) + actionmailer (4.2.2) + actionpack (= 4.2.2) + actionview (= 4.2.2) + activejob (= 4.2.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.1) - actionview (= 4.2.1) - activesupport (= 4.2.1) + actionpack (4.2.2) + actionview (= 4.2.2) + activesupport (= 4.2.2) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.1) - actionview (4.2.1) - activesupport (= 4.2.1) + actionview (4.2.2) + activesupport (= 4.2.2) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.1) - activejob (4.2.1) - activesupport (= 4.2.1) + activejob (4.2.2) + activesupport (= 4.2.2) globalid (>= 0.3.0) - activemodel (4.2.1) - activesupport (= 4.2.1) + activemodel (4.2.2) + activesupport (= 4.2.2) builder (~> 3.1) - activerecord (4.2.1) - activemodel (= 4.2.1) - activesupport (= 4.2.1) + activerecord (4.2.2) + activemodel (= 4.2.2) + activesupport (= 4.2.2) arel (~> 6.0) - activesupport (4.2.1) + activesupport (4.2.2) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -99,14 +99,14 @@ GEM extlib (0.9.16) faraday (0.9.1) multipart-post (>= 1.2, < 3) - faraday-http-cache (1.1.0) + faraday-http-cache (1.1.1) faraday (~> 0.8) ffi (1.9.6) figaro (1.1.1) thor (~> 0.14) font-awesome-rails (4.3.0.0) railties (>= 3.2, < 5.0) - globalid (0.3.3) + globalid (0.3.5) activesupport (>= 4.1.0) google-api-client (0.8.6) activesupport (>= 3.2) @@ -151,7 +151,7 @@ GEM execjs (>= 1.4.0) multi_json (~> 1.0) therubyracer (~> 0.12.1) - json (1.8.2) + json (1.8.3) jwt (1.5.0) kaminari (0.16.3) actionpack (>= 3.0.0) @@ -159,7 +159,7 @@ GEM kgio (2.9.3) launchy (2.4.3) addressable (~> 2.3) - letter_opener (1.4.0) + letter_opener (1.4.1) launchy (~> 2.2) libv8 (3.16.14.7) listen (1.3.1) @@ -176,9 +176,9 @@ GEM mime-types (>= 1.16, < 3) memcachier (0.0.2) memoist (0.12.0) - mime-types (2.5) + mime-types (2.6.1) mini_portile (0.6.2) - minitest (5.6.1) + minitest (5.7.0) multi_json (1.11.0) multipart-post (2.0.0) netrc (0.10.3) @@ -187,7 +187,7 @@ GEM mini_portile (~> 0.6.0) ohanakapa (1.1.2) sawyer (~> 0.5.3) - parser (2.2.2.2) + parser (2.2.2.5) ast (>= 1.1, < 3.0) poltergeist (1.6.0) capybara (~> 2.1) @@ -199,22 +199,22 @@ GEM rack (>= 1.1, < 2.0) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.6.1) + rack (1.6.4) rack-cache (1.2) rack (>= 0.4) rack-rewrite (1.5.1) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.1) - actionmailer (= 4.2.1) - actionpack (= 4.2.1) - actionview (= 4.2.1) - activejob (= 4.2.1) - activemodel (= 4.2.1) - activerecord (= 4.2.1) - activesupport (= 4.2.1) + rails (4.2.2) + actionmailer (= 4.2.2) + actionpack (= 4.2.2) + actionview (= 4.2.2) + activejob (= 4.2.2) + activemodel (= 4.2.2) + activerecord (= 4.2.2) + activesupport (= 4.2.2) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.1) + railties (= 4.2.2) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -229,9 +229,9 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.4) rails_stdout_logging (0.0.3) - railties (4.2.1) - actionpack (= 4.2.1) - activesupport (= 4.2.1) + railties (4.2.2) + actionpack (= 4.2.2) + activesupport (= 4.2.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.0.0) @@ -242,33 +242,33 @@ GEM rb-kqueue (0.2.3) ffi (>= 0.5.0) ref (1.0.5) - requirejs-rails (0.9.5) + requirejs-rails (0.9.8) railties (>= 3.1.1) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) retriable (1.4.1) - rspec-core (3.2.1) - rspec-support (~> 3.2.0) - rspec-expectations (3.2.0) + rspec-core (3.3.1) + rspec-support (~> 3.3.0) + rspec-expectations (3.3.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.2.0) - rspec-mocks (3.2.1) + rspec-support (~> 3.3.0) + rspec-mocks (3.3.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.2.0) - rspec-rails (3.2.1) + rspec-support (~> 3.3.0) + rspec-rails (3.3.2) actionpack (>= 3.0, < 4.3) activesupport (>= 3.0, < 4.3) railties (>= 3.0, < 4.3) - rspec-core (~> 3.2.0) - rspec-expectations (~> 3.2.0) - rspec-mocks (~> 3.2.0) - rspec-support (~> 3.2.0) - rspec-support (3.2.2) - rubocop (0.31.0) + rspec-core (~> 3.3.0) + rspec-expectations (~> 3.3.0) + rspec-mocks (~> 3.3.0) + rspec-support (~> 3.3.0) + rspec-support (3.3.0) + rubocop (0.32.0) astrolabe (~> 1.3) - parser (>= 2.2.2.1, < 3.0) + parser (>= 2.2.2.5, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) @@ -276,7 +276,7 @@ GEM ruby_parser (3.6.5) sexp_processor (~> 4.1) safe_yaml (1.0.4) - sass (3.4.13) + sass (3.4.14) sass-rails (5.0.1) railties (>= 4.0.0, < 5.0) sass (~> 3.1) @@ -373,7 +373,7 @@ DEPENDENCIES rack-rewrite (~> 1.5.0) rails (~> 4.2) rails_12factor - requirejs-rails (= 0.9.5) + requirejs-rails rspec-rails (~> 3.1) rubocop sass-rails (~> 5.0.1)