aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Upgrade to gettext 2.3.3 in order to get fix for bug that was causing ↵Louise Crow2012-10-25-12/+7
| | | | | | strings with a # in them not to be stored in the .pot file for translation. Upgrade to the current standard version of gettext_i18n_rails in order to support gettext 2.3.3 and as it now has our patches. \o/
* Fix failing timezone specs. As we are now setting a value for timezone in ↵Louise Crow2012-10-25-8/+43
| | | | | | config.timezone, this switches on ActiveRecord::time_zone_aware_attributes, so values are returned in the time zone specified (although still saved in whatever is specified in ActiveRecord.default_timezone in the db - in our case UTC). Previously with no timezone set, values would have been returned in UTC. So add some lines to look at the zone the data is saved in before the time_zone_aware_attributes kick in, and some lines to look at the values afterwards. Note that expected raw_saved time values are the same as the previous expected values for saved time (when there was no attribute time zone awareness), but that the time zone of values coming back on the model is set by config.time_zone and then overridden by Time.use_zone.
* Fix spec - based on the spec description, what's being tested and the other ↵Louise Crow2012-10-25-12/+12
| | | | specs, I assume that the activerecord default timezone is supposed to be set to :local as a precondition. Doing so makes the spec pass and make sense.
* Remove redundant line.Louise Crow2012-10-24-2/+1
|
* Merge branch 'feature/ruby-19-compat-immediate' into developLouise Crow2012-10-24-4/+410
|\ | | | | | | | | Conflicts: Gemfile.lock
| * Convert example in comment to failing spec, update regex to make spec pass - ↵Louise Crow2012-10-18-2/+328
| | | | | | | | again the use of converted HTML parts in emails means extra leading spaces.
| * Gemfile.lock is reordered.Louise Crow2012-10-18-1/+1
| |
| * Convert request cited in comment to failing spec, update regex to make it ↵Louise Crow2012-10-18-2/+82
| | | | | | | | pass (we now use the HTML parts of emails by preference, so there are some leading spaces.)
* | Merge remote-tracking branch 'openaustralia_github/add_timezone_support' ↵Louise Crow2012-10-24-0/+8
|\ \ | | | | | | | | | into develop
| * | Add support for showing all dates and times in the correct timezoneMatthew Landauer2012-10-19-0/+8
| | |
* | | Restore disclosure log fields.Louise Crow2012-10-24-0/+2
| | |
* | | Merge remote-tracking branch ↵Louise Crow2012-10-24-34/+38
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/csv_export_internal_admin_authority_bug' into develop Conflicts: app/controllers/public_body_controller.rb
| * | | added notes to csv exportMatthew Landauer2012-10-24-0/+2
| | | |
| * | | When exporting the authorities as csv don't include the internal admin authorityMatthew Landauer2012-10-24-2/+2
| | | |
| * | | Extract methodMatthew Landauer2012-10-24-32/+36
| | | |
* | | | Merge remote-tracking branch 'openaustralia_github/disclosure_log' into developLouise Crow2012-10-24-4/+33
|\ \ \ \
| * | | | Allow disclosure log urls to be downloaded in authorities csvMatthew Landauer2012-10-22-0/+2
| | | | |
| * | | | Allow disclosure_log to be imported in csvMatthew Landauer2012-10-22-2/+2
| | | | |
| * | | | Showing public body in admin interface make publication_scheme and ↵Matthew Landauer2012-10-22-1/+1
| | | | | | | | | | | | | | | | | | | | disclosure_log links
| * | | | Remove unnecessary codeMatthew Landauer2012-10-22-2/+2
| | | | |
| * | | | Show disclosure log link if availableMatthew Landauer2012-10-22-0/+11
| | | | |
| * | | | Allow disclosure log url to be edited in admin interfaceMatthew Landauer2012-10-22-0/+3
| | | | |
| * | | | Add migration to add disclosure_log fieldMatthew Landauer2012-10-22-0/+13
| | |/ / | |/| |
* | | | Capistrano gem 2.13.3 yanked from rubygems.orgLouise Crow2012-10-24-1/+1
| | | |
* | | | Following 32ac4ff55f2e174718fad97fcbd57b50a3daef7b, add some brief ↵Louise Crow2012-10-24-27/+34
| | | | | | | | | | | | | | | | documentation about newrelic.yml-example, and switch off all monitoring by default. I don't think we want to get into the situation where a new install has monitoring running but doesn't know.
* | | | Add an option to calls to calculate_status and display_status to specify ↵Louise Crow2012-10-23-12/+11
| |/ / |/| | | | | | | | that the method can return a value cached on the object by a previous call.
* | | Remove debug line.Louise Crow2012-10-23-1/+0
| | |
* | | Fix typo.Louise Crow2012-10-23-2/+3
| | |
* | | Add spec - currently failing due to typo.Louise Crow2012-10-23-0/+42
| | |
* | | Add a clause to exclude from the original set of info requests to be ↵Louise Crow2012-10-23-1/+14
| | | | | | | | | | | | processed any for which the last event of a kind which could form the initial request has already been alerted on.
* | | Don't keep re-calling info_request.calculate_statusLouise Crow2012-10-23-5/+6
| | |
* | | Line length reformatting.Louise Crow2012-10-23-1/+3
| | |
* | | Add extra checks from ↵Louise Crow2012-10-23-2/+4
| | | | | | | | | | | | https://github.com/mysociety/alaveteli/commit/cdb1c9420169ed6eafdd4e57ca21e1809c95e5cb and some extra description.
* | | Don't keep recalculating the request statusLouise Crow2012-10-23-14/+15
| | |
* | | Adding new spec from ↵Louise Crow2012-10-23-2/+13
| | | | | | | | | | | | https://github.com/mysociety/alaveteli/commit/cdb1c9420169ed6eafdd4e57ca21e1809c95e5cb
* | | Reformat line for length.Louise Crow2012-10-23-1/+8
| | |
* | | Trying a higher PassengerMaxRequests value - we now have some headroom in ↵Louise Crow2012-10-23-1/+1
| | | | | | | | | | | | terms of memory, but CPU limited.
* | | Merge remote-tracking branch ↵Louise Crow2012-10-22-5/+10
|\ \ \ | | | | | | | | | | | | 'openaustralia_github/no_google_analytics_for_admin_users' into develop
| * | | Only show google analytics if you are either not logged in or a normal user ↵Matthew Landauer2012-10-18-2/+2
| | | | | | | | | | | | | | | | (not a superuser)
| * | | Extract method for finding whether user is a superuserMatthew Landauer2012-10-18-3/+8
| | | |
* | | | Merge remote-tracking branch ↵Louise Crow2012-10-22-4/+8
|\ \ \ \ | | | | | | | | | | | | | | | 'openaustralia_github/country_message_for_pre_release_site' into develop
| * | | | Fix bug where visitors from overseas visit a site which is not officially ↵Matthew Landauer2012-10-19-3/+8
| | | | | | | | | | | | | | | | | | | | live yet
| * | | | Inline temporary variableMatthew Landauer2012-10-19-3/+2
| | |/ / | |/| |
* | | | Merge branch 'features/better-frontpage-text' into developLouise Crow2012-10-22-2/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Add slightly more sensible request description text for the case where the ↵Louise Crow2012-10-18-2/+9
| | | | | | | | | | | | | | | | requests are not necessarily answered.
* | | | Merge remote-tracking branch 'henare_github/disable-caching-in-development' ↵Louise Crow2012-10-18-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | into develop
| * | | Disabled caching in development, looks like it was accidentally enabled in ↵Henare Degan2012-10-18-1/+1
| |/ / | | | | | | | | | 9ffbadea
* | | Merge remote-tracking branch ↵Louise Crow2012-10-18-3/+223
|\ \ \ | | | | | | | | | | | | 'openaustralia_github/optional_new_relic_support' into develop
| * | | Link new relic configuration into shared area on deployMatthew Landauer2012-10-18-0/+1
| | | |
| * | | Add example newrelic configuration fileMatthew Landauer2012-10-18-0/+216
| | | |