| Commit message (Collapse) | Author | Age | Lines |
|
|
|
| |
different versions of postgres are producing minor variations every time this is generated, it's proving more of a hindrance than a help to development. Happy to reinstate it if anyone has suggestions about how to keep it stable across minor postgres version differences.
|
|
|
|
| |
AlaveteliConfiguration
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| |
| |
| |
| |
| |
| | |
Also has the advantage that it makes it easier to switch between branches
with different schemas as the test db schema will be generated from the
checked in file.
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
Gemfile
Gemfile.lock
app/controllers/general_controller.rb
app/controllers/track_controller.rb
app/models/outgoing_message.rb
app/models/public_body.rb
app/models/user.rb
app/views/general/frontpage.rhtml
config/environment.rb
config/initializers/inflections.rb
config/initializers/mime_types.rb
db/migrate/094_remove_old_tags_foreign_key.rb
lib/timezone_fixes.rb
spec/models/request_mailer_spec.rb
spec/views/request/list.rhtml_spec.rb
|
| |
| |
| |
| | |
don't work as the table has been renamed, and they automatically generate the index name from the table name. Apply custom index name from a5e90e2b7ea6adedbf80c05bbb84425a02c63da0.
|
| |
| |
| |
| |
| | |
* The public_body_tags table had already been removed
* The index has_tag_string_tags generated a name longer than the Postgres maximum of 63 characters. It was ignored in earlier Rails versions, see: https://rails.lighthouseapp.com/projects/8994/tickets/6187-postgresql-and-rails-303-migrations-fail-with-index-name-length-64-chars
|
| |
| |
| |
| | |
newer version of acts_as_versioned we're using since 2ba57e8
|
| |
| |
| |
| |
| | |
* The public_body_tags table had already been removed
* The index has_tag_string_tags generated a name longer than the Postgres maximum of 63 characters. It was ignored in earlier Rails versions, see: https://rails.lighthouseapp.com/projects/8994/tickets/6187-postgresql-and-rails-303-migrations-fail-with-index-name-length-64-chars
|
|/ |
|
| |
|
|
|
|
| |
sqlite.
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
into develop
Conflicts:
config/general.yml-example
|
| | |
|
| |
| |
| |
| | |
with interlock/memcached.
|
|/
|
|
| |
always fails on this migration.
|
|\ |
|
| | |
|
|/ |
|
|
|
|
| |
retrieved in the admin timeline view.
|
|
|
|
| |
efficiently by info_request_event_id
|
|
|
|
| |
this will improve the performance of AdminRequestController#destroy_incoming, which looks for outgoing messages by incoming message.
|
|
|
|
| |
bodies.
|
| |
|
|
|
|
| |
efficiently when creating league tables for the request classification game.
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
app/controllers/admin_public_body_controller.rb
app/views/admin_public_body/import_csv.rhtml
spec/controllers/admin_public_body_controller_spec.rb
spec/models/info_request_spec.rb
|
| |
| |
| |
| | |
has some advantages (notably avoiding permanent versus transient session hijack possibilities), I think it needs some more work/testing (we'd need to have good code for cleaning out stale activerecord sessions periodically - with activerecord store this is now our responsibility). We'd also need to reset the session key to kill all in progress sessions to prevent errors as rails tries to store long cookie keys in the limited key field of the activerecord store. For this release, it'll be more straightforward to fix the csv_upload file issue #526 in a more localized way.
|
| | |
|
|/ |
|
|
|
|
| |
CensorRules that aren't attached to a User or Request or Public Body (but don't expose this in the admin UI). Fixes #33
|
|
|
|
|
|
|
|
|
| |
If we are using PostgreSQL, populate the api_key column in a more
efficient fashion.
Conflicts:
db/migrate/112_add_api_key_to_public_bodies.rb
|
| |
|
|
|
|
|
| |
Add data model support for “external” requests, i.e. requests added
via the API rather than made using the site.
|
| |
|
| |
|
|
|
|
|
|
| |
* Change "email me about stuff" wording to "follow" throughout
* Introduce a new flag that the user can set, which controls if they get email alerts
* Add a new link to a "wall" for logged in users where they can see a feed of all the things they're following
|
|
|
|
|
|
| |
new "needs admin attention"-type state to InfoRequests, a flag indicating that a request has ever been marked as needing admin attention, and a controller method and route for setting this state & flag. Also adds the reason something needs admin attention to the subject of the email that gets sent to administrators.
Neeeds tests.
|
| |
|
| |
|
|
|
|
| |
Next step: making it asynchronous, e.g. with a queue of things to purge via a cron job.
|
|
|
|
|
|
| |
Add the capability to specify a limit to the number of requests a
user can make per day, which can be turned off for specific users
in the admin interface.
|
|
|
|
| |
date, resulting in incoming_messages all apparently being sent on January 1, 2000)
|
|
|
|
| |
feature in CHANGES.md
|
|
|
|
| |
field on incoming_messages. Currently mails are always parsed just-in-time, but could be parsed as a queue in the future.
|