aboutsummaryrefslogtreecommitdiffstats
path: root/config/environments
Commit message (Collapse)AuthorAgeLines
* Merge branch 'feature/rails-3-2-upgrade-spike' into ↵Mark Longair2013-11-29-0/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/switch-to-asset-pipeline Conflicts: Gemfile.lock app/assets/images/admin-theme/ui-bg_flat_0_aaaaaa_40x100.png app/assets/images/admin-theme/ui-bg_flat_55_fbf9ee_40x100.png app/assets/images/admin-theme/ui-bg_flat_65_ffffff_40x100.png app/assets/images/admin-theme/ui-bg_flat_75_cccccc_40x100.png app/assets/images/admin-theme/ui-bg_flat_75_dadada_40x100.png app/assets/images/admin-theme/ui-bg_flat_75_e6e6e6_40x100.png app/assets/images/admin-theme/ui-bg_flat_75_ffffff_40x100.png app/assets/images/admin-theme/ui-bg_inset-soft_95_fef1ec_1x100.png app/assets/images/admin-theme/ui-icons_222222_256x240.png app/assets/images/admin-theme/ui-icons_2e83ff_256x240.png app/assets/images/admin-theme/ui-icons_454545_256x240.png app/assets/images/admin-theme/ui-icons_888888_256x240.png app/assets/images/admin-theme/ui-icons_cd0a0a_256x240.png app/assets/javascripts/admin.js app/assets/javascripts/admin/jquery-ui.min.js app/assets/javascripts/application.js app/assets/javascripts/jquery-ui.min.js app/assets/javascripts/jquery.flot.errorbars.min.js app/assets/javascripts/jquery.flot.min.js app/assets/javascripts/stats.js app/assets/stylesheets/application.css app/assets/stylesheets/fonts.scss app/views/general/_stylesheet_includes.html.erb app/views/layouts/admin.html.erb app/views/layouts/default.html.erb app/views/public_body/statistics.html.erb config/application.rb config/environments/development.rb
| * Add a dummy exception notification address for testingLouise Crow2013-11-12-0/+5
| | | | | | | | | | | | ActionMailer now checks for a 'to' address on sending mail, so supply one so that we can check exception notification mail sending. Also check that we have one before trying to call the exception notification code.
| * Add default Rails 3.2 development settings.Louise Crow2013-11-12-0/+7
| | | | | | | | As suggested in http://guides.rubyonrails.org/3_2_release_notes.html
| * Beginning of switch to using the asset pipelineMark Longair2013-09-30-0/+24
| |
* | Enable the Rails asset pipeline (Sprockets)Mark Longair2013-11-19-0/+24
| |
* | Add a config option for whether to use mailcatcher in developmentMark Longair2013-10-29-3/+8
|/ | | | | Sometimes it's useful to be able to really send mail in development mode, so add a config option for that.
* Merge remote-tracking branch 'mysociety/develop' into rails-3-developHenare Degan2013-03-14-0/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock app/controllers/admin_request_controller.rb app/controllers/admin_track_controller.rb app/controllers/request_controller.rb app/controllers/services_controller.rb app/helpers/link_to_helper.rb app/mailers/request_mailer.rb app/models/application_mailer.rb app/models/info_request.rb app/views/admin_censor_rule/edit.html.erb app/views/admin_censor_rule/new.html.erb app/views/admin_public_body/_form.html.erb app/views/admin_public_body/_locale_selector.html.erb app/views/admin_public_body/_one_list.html.erb app/views/admin_public_body/edit.html.erb app/views/admin_public_body/list.html.erb app/views/admin_public_body/new.html.erb app/views/admin_request/_incoming_message_actions.html.erb app/views/admin_request/edit.html.erb app/views/admin_request/edit_comment.html.erb app/views/admin_request/edit_outgoing.html.erb app/views/admin_request/list.html.erb app/views/admin_request/list_old_unclassified.html.erb app/views/admin_request/show.html.erb app/views/admin_track/_some_tracks.html.erb app/views/admin_track/list.html.erb app/views/admin_user/edit.html.erb app/views/admin_user/list.html.erb app/views/admin_user/show.html.erb app/views/general/_footer.html.erb app/views/general/exception_caught.html.erb app/views/help/contact.html.erb app/views/layouts/default.html.erb app/views/public_body/_alphabet.html.erb app/views/request/_request_listing_single.html.erb app/views/request/_sidebar.html.erb app/views/request/new.html.erb app/views/request/show.html.erb app/views/request_mailer/external_response.rhtml app/views/request_mailer/fake_response.rhtml config/environment.rb config/environments/production.rb config/routes.rb spec/controllers/admin_censor_rule_controller_spec.rb spec/controllers/request_controller_spec.rb spec/controllers/track_controller_spec.rb spec/helpers/link_to_helper_spec.rb spec/mailers/request_mailer_spec.rb spec/models/info_request_spec.rb spec/spec_helper.rb spec/views/public_body/show.html.erb_spec.rb spec/views/request/show.html.erb_spec.rb vendor/plugins/rails_xss/lib/rails_xss/erubis.rb
| * Add comment about middleware change for rails 3Matthew Landauer2013-02-19-1/+5
| |
| * Fix for incoming mailer failing with undefined method `new' for ↵Matthew Landauer2013-02-19-1/+2
| | | | | | | | "Rack::SSL":String
| * Oops. ssl configuration should be in production environmentMatthew Landauer2013-02-15-2/+2
| |
| * Add configuration to force ssl for the whole siteMatthew Landauer2013-02-15-0/+2
| |
* | Reinstate exception_notificationHenare Degan2013-03-05-0/+6
| |
* | See how we go not disabling this nowHenare Degan2013-03-03-2/+0
| |
* | No longer available in Rails 3.1Henare Degan2013-03-03-1/+0
| |
* | Add some new Rails 3 settings and tidy up environments filesHenare Degan2012-12-11-8/+13
| |
* | Don't reduce the log level in developmentHenare Degan2012-12-11-2/+0
| |
* | Add new Rails 3 configHenare Degan2012-12-11-1/+3
| |
* | Upgrade environment configurationsHenare Degan2012-12-11-69/+76
|/
* Add the ability to support a staging environment.Louise Crow2012-11-05-0/+19
|
* fix path to patch for Ruby 1.9James McKinney2012-11-01-1/+1
|
* Merge remote-tracking branch ↵Louise Crow2012-11-01-2/+5
|\ | | | | | | | | | | | | 'openaustralia_github/use_mailcatcher_in_development' into develop Conflicts: Gemfile.lock
| * By default in development send mails to mailcatcherMatthew Landauer2012-10-18-2/+5
| |
* | Disabled caching in development, looks like it was accidentally enabled in ↵Henare Degan2012-10-18-1/+1
|/ | | | 9ffbadea
* Remove gem spec from environmentRobin Houston2012-06-06-2/+0
| | | | This was causing me strange errors, and we think is not needed.
* Don't send emails in development; output them to the console instead.Seb Bacon2012-05-25-0/+1
|
* More changes and refactoring to make purges work.Seb Bacon2012-04-20-0/+2
|
* Don't load gems in environment now we use bundlerSeb Bacon2012-03-09-2/+0
|
* Avoid need to be db superuser to run testsRobin Houston2012-01-31-0/+2
| | | | | Add a patch from louisecrow (https://github.com/mysociety/fixmytransport/blob/master/lib/patches/fixtures_constraint_disabling.rb) that makes it possible to run the tests without being a database superuser.
* Fail silently if third party services are broken or unavailable. Fixes #354.Seb Bacon2012-01-17-0/+1
|
* initial, basic i18n support with gettextSeb Bacon2011-03-10-0/+2
|
* merge from master (post-CSRF changes)Seb Bacon2011-03-09-0/+5
|\
| * Disable CSRF protection in the test environmentLouise Crow2011-02-24-1/+4
| |
| * Add rspec-rails as a dependency for the test env.Louise Crow2011-02-23-1/+3
| |
* | ensure tests run with test environmentSeb Bacon2011-02-25-3/+1
|/
* Don't need object debugging any more.francis2009-09-17-2/+4
|
* Constants must be capsfrancis2009-09-10-0/+4
|
* Page cache attachments.francis2008-09-12-1/+1
|
* Migration to Rails 2.1francis2008-09-04-1/+0
|
* many design thingsangie2008-04-24-1/+0
|
* Migration to Rails 2.0.2francis2008-01-23-3/+0
|
* Only use sendmail for mail delivery in dev and production, not in test.francis2007-12-13-0/+4
|
* Default Rails gumph.francis2007-08-01-0/+58