Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Upgrade JSON gem to get fix for CVE-2013-0269. Update to latest Rails 2-3 ↵hotfix/0.6.9.3 | Louise Crow | 2013-02-11 | -22/+22 |
| | | | | series - has fixes for CVE-2013-0277, CVE-2013-0276, although alaveteli does not use attr_protected or serialize. | |||
* | Merge branch 'hotfix/0.6.9.2'0.6.9.2 | Louise Crow | 2013-01-29 | -20/+20 |
|\ | ||||
| * | Upgrade Rails to version 2.3.16 to get fix for CVE-2013-0333.hotfix/0.6.9.2 | Louise Crow | 2013-01-29 | -20/+20 |
|/ | ||||
* | Update lock to latest copy of rails - 2.3.150.6.9.10.6.9 | Louise Crow | 2013-01-15 | -2/+2 |
| | ||||
* | Merge branch 'release/0.6.9' | Louise Crow | 2013-01-15 | -7761/+3529 |
|\ | ||||
| * | Try just specifying that rails should come from git, to avoid deprecation ↵ | Louise Crow | 2013-01-15 | -10/+0 |
| | | | | | | | | warnings about "require 'actionmailer'" rather than "require 'action_mailer'" etc. | |||
| * | Add note on Rails security upgrades to change file. | Louise Crow | 2013-01-15 | -0/+1 |
| | | ||||
| * | Add updated Gemfile.lock after running bundle install. | Louise Crow | 2013-01-15 | -10/+21 |
| | | ||||
| * | Update Gemfile to use a security patched copy of rails from the mySociety ↵ | Louise Crow | 2013-01-15 | -1/+9 |
| | | | | | | | | git repo | |||
| * | Latest translations pulled from Transifex. | Louise Crow | 2013-01-14 | -11/+12 |
| | | ||||
| * | Bump Alaveteli release number. | Louise Crow | 2013-01-14 | -1/+1 |
| | | ||||
| * | Latest translations pulled from Transifex to fix inadvertantly committed ↵ | Louise Crow | 2013-01-14 | -1250/+266 |
| | | | | | | | | unmerged conflicted files. | |||
| * | Merge branch 'hotfix/0.6.8.3' into release/0.6.9 | Louise Crow | 2013-01-09 | -21/+1649 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock locale/ar/app.po locale/cs/app.po locale/cy/app.po locale/en_IE/app.po locale/es/app.po locale/pt_BR/app.po | |||
| * | | Add release notes for 0.6.9 | Louise Crow | 2012-12-18 | -0/+18 |
| | | | ||||
| * | | Latest translation files re-pulled from Transifex to get rid of fuzzy strings. | Louise Crow | 2012-12-18 | -963/+467 |
| | | | ||||
| * | | Latest translations from Transifex. | Louise Crow | 2012-12-18 | -11/+3926 |
| | | | ||||
| * | | Limit pagination on similar pages in line with new upper limit on page offset. | Louise Crow | 2012-12-17 | -1/+3 |
| | | | ||||
| * | | Only serve up 'similar' pages up to the offset we use for list. | Louise Crow | 2012-12-17 | -0/+13 |
| | | | ||||
| * | | Don't test travis fix branch anymore. | Louise Crow | 2012-12-17 | -1/+0 |
| | | | ||||
| * | | Don't install the develop or development group of gems in travis. | Louise Crow | 2012-12-17 | -0/+4 |
| | | | ||||
| * | | Add a spec to test that mailin does not produce any output. This is ↵ | Louise Crow | 2012-12-17 | -0/+21 |
| | | | | | | | | | | | | important as under some MTA configurations, any output will result in a bounce message being sent to the original mail sender. | |||
| * | | Adding mocking of incoming message id. | Louise Crow | 2012-12-17 | -0/+1 |
| | | | ||||
| * | | Don't install packages from the package list that we've already installed ↵ | Louise Crow | 2012-12-17 | -1/+1 |
| | | | | | | | | | | | | another way. | |||
| * | | Don't install rubygems - just need to update. However, seems like you can't ↵ | Louise Crow | 2012-12-17 | -1/+1 |
| | | | | | | | | | | | | downgrade from the current rubygems under ruby 1.9.3 (1.8.24) to 1.6.2 in one go :( - add an intermediate version. | |||
| * | | Actually the 1st Nov, not 15th. | Louise Crow | 2012-12-17 | -1/+1 |
| | | | ||||
| * | | Send the annual bank holiday reminder half-way through November, not on the ↵ | Louise Crow | 2012-12-17 | -1/+1 |
| | | | | | | | | | | | | 1st of January, so there's actually time to act on it before the usual Jan 1 Bank Holiday being missing starts resulting in incorrect due dates. | |||
| * | | Rewrite specs that were in spec/controller/application_controller as ↵ | Louise Crow | 2012-12-17 | -56/+71 |
| | | | | | | | | | | | | full-stack controller specs in the relevant controllers. It turns out that having spec blocks that reference the ApplicationController class directly i.e. "describe ApplicationController" can have unpredictable effects. actionpack's action_controller/test_case.rb rewrites rescue_action_without_handler on whatever it is included in, and if this is done on a controller class, and then directly on action controller, it can result in an infinite loop of recursive calls. This turns out to be the problem that was causing some tests in error_spec.rb to fail in Travis under Ruby 1.9. | |||
| * | | Merge branch 'hotfix/authenticate-and-expire-download-zips' into develop | Louise Crow | 2012-12-13 | -13/+67 |
| |\ \ | ||||
| * | | | Updated lock file. | Louise Crow | 2012-12-13 | -0/+1 |
| | | | | ||||
| * | | | Restore rspec - causing errors on production deploy with cap. | Louise Crow | 2012-12-13 | -0/+1 |
| | | | | ||||
| * | | | Merge branch 'hotfix/no-html-conversion-for-hidden' into develop | Louise Crow | 2012-12-13 | -3/+18 |
| |\ \ \ | ||||
| * | | | | Reformat for line length, add the expected response code. | Louise Crow | 2012-12-13 | -2/+9 |
| | | | | | ||||
| * | | | | Don't offer or allow viewing of an HTML version of a request if it is ↵ | Louise Crow | 2012-12-13 | -8/+29 |
| | | | | | | | | | | | | | | | | | | | | hidden, or requester_only. Google docs viewer won't be able to access it, and our own conversion process currently produces image files that will then be publicly viewable. If necessary we can revisit this code to enable admins and requesters to view the HTML version created by our own conversion without adding these files to a path that is served directly by the web server. | |||
| * | | | | Merge remote-tracking branch 'henare_github/rspec' into develop | Louise Crow | 2012-12-12 | -3/+0 |
| |\ \ \ \ | ||||
| | * | | | | Don't install rspec in production | Henare Degan | 2012-12-11 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also don't need to explicitly specify the rspec gem as rspec-rails depends on it | |||
| * | | | | | Merge branch 'feature/set-zone-in-tests' into develop | Louise Crow | 2012-12-12 | -50/+61 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||
| | * | | | | Wrap specs on the extraction of RFC-822 headers in code that sets the ENV ↵ | Louise Crow | 2012-12-11 | -50/+61 |
| |/ / / / | | | | | | | | | | | | | | | | timezone. TMail renders headers using localtime, which is not ideal, but we're migrating away from it anyway, so I'm not sure it's worth delving into the internals of TMail to fix it. | |||
| * | | | | Merge remote-tracking branch 'henare_github/relax-gc-for-tests' into develop | Louise Crow | 2012-12-10 | -0/+14 |
| |\ \ \ \ | ||||
| | * | | | | Only trigger garbage collection every 4 seconds - speeds up the whole test ↵ | Henare Degan | 2012-12-08 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | suite by ~35% on my machine Via https://37signals.com/svn/posts/2742-the-road-to-faster-tests | |||
| * | | | | | Merge remote-tracking branch 'henare_github/move-gem' into develop | Louise Crow | 2012-12-10 | -1/+1 |
| |\ \ \ \ \ | ||||
| | * | | | | | Don't install test-unit in production | Henare Degan | 2012-12-09 | -1/+1 |
| | |/ / / / | ||||
| * | | | | | Merge remote-tracking branch 'henare_github/remove-vendored-gem' into develop | Louise Crow | 2012-12-10 | -6253/+0 |
| |\ \ \ \ \ | ||||
| | * | | | | | Remove vendored fakeweb gem. I think this was missed when we switched to Bundler | Henare Degan | 2012-12-08 | -6253/+0 |
| | |/ / / / | ||||
| * | | | | | Add another branch to travis testing to resolve the test failures that only ↵ | Louise Crow | 2012-12-10 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | seem to happen in travis. | |||
| * | | | | | Merge branch 'feature/rework-mail-handling' into develop | Louise Crow | 2012-12-06 | -386/+1331 |
| |\ \ \ \ \ | ||||
| | * | | | | | Add specs for attachment attributes. | Louise Crow | 2012-12-06 | -0/+20 |
| | | | | | | | ||||
| | * | | | | | Add alternative sanitization for Ruby 1.9 | Louise Crow | 2012-12-06 | -23/+57 |
| | | | | | | | ||||
| | * | | | | | Test on Ruby 1.9.3 in Travis. | Louise Crow | 2012-12-06 | -0/+1 |
| | | | | | | | ||||
| | * | | | | | Patch the parameter hash used in Mail to handle nil values. | Louise Crow | 2012-12-06 | -0/+19 |
| | | | | | | | ||||
| | * | | | | | Convert url in comment to spec. | Louise Crow | 2012-12-06 | -1/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/mail_handler/backends/tmail_backend.rb |