Merge branch 'master' into master-legacy

berkmancenter · Sep 5, 2018 · e4155f1 · e4155f1
2 parents 0d4b719 + f7a2366
commit e4155f1
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 13 deletions.
diff --git a/app/assets/images/Cc.logo.circle.svg b/app/assets/images/Cc.logo.circle.svg
diff --git a/app/assets/images/arrow-dark.svg b/app/assets/images/arrow-dark.svg
diff --git a/app/assets/images/arrow-small.svg b/app/assets/images/arrow-small.svg
diff --git a/app/assets/images/arrow.svg b/app/assets/images/arrow.svg
diff --git a/app/assets/images/logo.svg b/app/assets/images/logo.svg
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
@@ -12,7 +12,7 @@
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS
   config.assets.compress = true

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -1 +1,2 @@
-Rails.application.config.assets.precompile += %w( rails_admin/custom/ui.js piwik.js )
+Rails.application.config.assets.precompile += %w[rails_admin/custom/ui.js
+                                                 piwik.js]
diff --git a/ELASTICSEARCH_INDEXING.md → doc/ELASTICSEARCH_INDEXING.md b/ELASTICSEARCH_INDEXING.md → doc/ELASTICSEARCH_INDEXING.md
diff --git a/IMPORTING.md → doc/IMPORTING.md b/IMPORTING.md → doc/IMPORTING.md
diff --git a/doc/release.md b/doc/release.md
@@ -7,7 +7,8 @@ If any deploys have special instructions, write them here, with a date and PR nu
 
 * 16 August 2018/PR #470: requires cron job update (see https://github.com/berkmancenter/lumendatabase/pull/470)
 * 29 August 2018/PR #482: crontabs on enyos, percy, and flutie will need to be edited so to run rake lumen:* tasks rather than rake chillingeffects:* tasks. https://github.com/berkmancenter/lumendatabase/pull/482
-* Move bin/init-env.sh to .env
+* Move bin/init-env.sh to .env (cat bin/init-env.sh >> .env; vi .env; : ; %s/export\s//g ; remove first line; exit, save)
+* Remove these instructions
 
 ## Hotfix
 * Write code, code-review, and merge into `dev` via the normal process.
@@ -53,8 +54,10 @@ If any deploys have special instructions, write them here, with a date and PR nu
 * `git pull origin <branch>`
   * Servers have correct default branches set so this is just `git pull` unless you need a different branch
 * `bundle install`
-* `cp ../ .env`
+* `cp ../.env .`
 * `rake db:migrate`
-  - The order of source and db:migrate is important!
+  - If this throws a `PG::ConnectionBad:` and asks something like "Is the server running locally and accepting connections on Unix domain socket "/var/run/postgresql/.s.PGSQL.5432"?", use `RAILS_ENV=production rake db:migrate`
+* `rake assets:clobber`
+* `rake assets:precompile`
 * `touch tmp/restart.txt`
   * This tells Passenger to restart its listener