-
Notifications
You must be signed in to change notification settings - Fork 57
Conversation
Conflicts: Gemfile.lock
Conflicts: README.md
stupid |
Conflicts: .env config/initializers/devise.rb
I think this is ready to go, other than intermittently failing test :-P. Please review to make sure that all relevant configuration parameters have been abstracted out and that everything is pretty well documented (including the wiki page and README). |
Stupid intermittent test failures (see #1059). It's mostly the rake test :-. |
set :deploy_to, "#{ENV['DEPLOY_DIR']}" | ||
|
||
# Set Rails environment | ||
# set, :rails_env, 'production' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should this be commented?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe it's the default, we could probably just take it out. Note that this PR probably doesn't have a finalized Capistrano setup since I have no way to test it, it's really just for the isolation of configuration parameters in environment variables and the setup of secrets.yml
and .env
+ documentation.
Wow this looks awesome. The new config page and the code read very well. I left a few minor inline comments. I'm definitely not an authority on deployment but as far as I can tell this looks ready. |
} | ||
|
||
# with these disabled, the server must be connected to the yale network for |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should remove/modify this comment to be meaningful to non-yale clients
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great point, done.
I generalized the comment in |
Cherry picking sounds like a pain. Merge this and we'll polish in #1074 |
Conflicts: app/models/user.rb config/environments/production.rb config/initializers/devise.rb config/initializers/setup_mail.rb
passing all but our troublesome tests (see #1059), merging! |
Resolves #683, still needs a bit of work