Merge branch 'develop' into user-edits

.github/ISSUE_TEMPLATE/generic-proposal-issue-template.md

@@ -0,0 +1,43 @@
+---
+name: Generic Proposal Issue Template
+about: Generic issue template for any proposed change. Has sections to add context
+  and guidance for how to implement the proposal. Designed to make issues clear and
+  easy to understand/work on.
+
+---
+
+_(This is a template. Please fill in the areas under each heading. Thanks!)_
+
+_(You may delete this text at the top when done!)_
+
+## Scope / difficulty
+
+A concise description of what files this will change, or what topic areas this proposal includes.
+
+If you think this proposal is easy or hard, you can say so here, so contributors will know what to expect.
+
+## Impact
+
+A concise description of what benefits and changes this proposal would introduce when complete.
+
+_(Helps convey what this means to the Refuge Restrooms project, and why this proposal is worth working on.)_
+
+## Rationale
+
+What motivated you to make this proposal. Why this proposal is needed, why it makes sense, why it is the right thing to do, etc.
+
+_(The human side of the reason for this proposal. Optional, but always nice to include!)_
+
+## Proposal
+
+The main proposal.
+
+Include info (including background and context) people will need to understand your proposal.
+
+Links and documentation that help explain parts of your proposal are welcome.
+
+## How to actually do this:
+
+Any guidance on how to complete the proposal. Can be a concrete set of steps such as "Just need to edit this file [link-to-file-on-our-GitHub]", "This guide should help: [link]", etc.
+
+Links and documentation that help explain how to actually fix this problem/implement the proposal, if you have them, are welcome.

.gitignore

@@ -29,7 +29,6 @@ rerun.txt
 pickle-email-*.html
 config/initializers/secret_token.rb
 config/secrets.yml
-geocoder.rb
 config/initializers/new_framework_defaults_5_1.rb
 config/initializers/application_controller_renderer.rb
 config/cable.yml

.travis.yml

@@ -3,7 +3,7 @@ env:
     - CC_TEST_REPORTER_ID=c18df080592f9c99ca8080a6d5e052aa5fd3964044a0fe0b71e48f8e18998dc2
 language: ruby
 services: docker
-before_install:
+install:
   - docker-compose build
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter

CONTRIBUTING.md

@@ -6,7 +6,12 @@
 https://help.github.com/articles/fork-a-repo/
 
 ### 2 Install Docker.
-https://docs.docker.com/install/
+- **Windows 10:** https://store.docker.com/editions/community/docker-ce-desktop-windows
+- **macOS El Capitan 10.11 and newer:** https://store.docker.com/editions/community/docker-ce-desktop-mac
+
+_(Older Mac or Windows PC? See [instructions for Docker Toolbox](https://github.com/RefugeRestrooms/refugerestrooms/wiki/How-to-use-Docker-Toolbox-with-Refuge-Restrooms).)_
+
+_(Running Linux? See [instructions for Docker CE on Linux](https://github.com/RefugeRestrooms/refugerestrooms/wiki/How-to-use-Docker-CE-on-Linux-with-Refuge-Restrooms).)_
 
 ### 3 Build the Docker Container
 Build the container from any [terminal](https://github.com/RefugeRestrooms/refugerestrooms/wiki/What-is-a-Terminal-(or-%22Terminal-Emulator%22)%3F-How-do-I-run-text-based-commands-on-my-computer%3F) program with:

Dockerfile

@@ -1,6 +1,10 @@
-FROM ruby:2.3.7
+FROM ruby:2.3.7-slim
 ENV PHANTOM_JS=2.1.1
 
+# Add basic binaries
+RUN apt-get update \
+  && apt-get install -y bzip2 curl gnupg wget
+
 # Add the apt repository for yarn
 RUN curl -sS http://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
   echo "deb http://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
@@ -19,6 +23,10 @@ RUN apt-get install build-essential chrpath libssl-dev libxft-dev -y && \
   mv $PHANTOM_JS /usr/local/share && \
   ln -sf /usr/local/share/$PHANTOM_JS/bin/phantomjs /usr/local/bin && \
   apt-get install -y yarn
+
+# Clean up the apt cache
+RUN rm -rf /var/lib/apt/lists/*
+
 RUN mkdir /refugerestrooms
 WORKDIR /refugerestrooms
 

Gemfile

@@ -1,60 +1,60 @@
 source 'https://rubygems.org'
 ruby '2.3.7'
 
-gem 'rails', '5.1.4'
-gem 'pg'
-gem 'pg_search'
-gem 'sass-rails'
+gem 'rails', '5.2.1'
+
+gem 'activeadmin', '~> 1.3'
+gem 'bootsnap', require: false
 gem 'bootstrap-sass'
-gem 'haml'
-gem 'uglifier', '>= 1.3.0'
+gem 'bugsnag'
 gem 'coffee-rails', '~> 4.2'
-gem 'turbolinks'
-gem 'jbuilder', '~> 2.5'
-gem 'geocoder', '~> 1.2.1'
-gem 'devise', '~> 4.3'
-gem 'rakismet'
 gem 'country_select'
-gem 'mail_form', '>= 1.7.0'
-gem 'simple_form', '~> 3.5'
-gem 'grape', '0.7.0'
+gem 'devise', '~> 4.3'
+gem 'geocoder', '~> 1.2.1'
+gem 'grape', '~> 0.7.0'
 gem 'grape-swagger', '~> 0.7.2'
 gem 'grape-kaminari'
-gem 'kaminari', '~> 0.17.0'
+gem 'haml'
 gem 'high_voltage', '~> 3.0.0'
-gem 'bugsnag'
-gem 'rack-cors', :require => 'rack/cors'
-gem 'rack-jsonp'
 gem 'http_accept_language'
+gem 'jbuilder', '~> 2.5'
+gem 'kaminari', '~> 0.17.0'
+gem 'mail_form', '>= 1.7.0'
+gem 'pg'
+gem 'pg_search'
 gem 'puma'
+gem 'rack-cors', :require => 'rack/cors'
+gem 'rack-jsonp'
+gem 'rakismet'
+gem 'sass-rails'
+gem 'simple_form', '~> 4.0'
+gem 'turbolinks'
+gem 'uglifier', '>= 1.3.0'
 gem 'webpacker', '~> 3.5'
 
-# Upgraded to 1.0.0 for Rails 5.1.4
-gem 'activeadmin', '~> 1.0.0'
-
 group :production do
   gem 'rails_12factor'
 end
 
 group :development, :test do
-  gem 'rspec-rails'
-  gem 'factory_bot_rails', '~> 4.8.2'
-  gem 'dotenv-rails', '~> 2.2.1'
-  gem 'pry'
   gem 'better_errors', '~> 2.4.0'
   gem 'binding_of_caller'
+  gem 'dotenv-rails', '~> 2.2.1'
+  gem 'factory_bot_rails', '~> 4.8.2'
+  gem 'listen', '>= 3.0.5', '< 3.2'
+  gem 'pry'
+  gem 'rspec-rails'
 end
 
 group :development do
   gem 'i18n-debug'
 end
 
 group :test do
-  gem 'rake'
   gem 'capybara'
   gem 'database_cleaner'
-  gem 'simplecov', '~> 0.7.1', require: false
   gem 'poltergeist'
+  gem 'simplecov', '~> 0.7.1', require: false
   gem 'webmock', '~> 1.18.0'
 end