| Commit message (Collapse) | Author | Age | Lines |
|---|
| |\ |
|
| |/|
| |
| |
| | |
ssh://git.mysociety.org/data/git/public/alaveteli into feature/less-destructive-themes-install
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Previously, the themes:install rake task would remove the existing
theme with 'rm -rf' and re-clone the theme into place. This is
unfortunate for a developer who has been making changes to a theme
and then runs the rails-post-deploy script, since it calls the
themes:install task which will wipe out those changes. In
addition, when installing themes it would deliberately remove the
.git directory of the theme, so if you do want to work in that
theme you'd have to reinitialize the theme directory to be a git
repository again.
This commit changes the task so that now:
- If a theme directory is present but it isn't a git
repository, it's moved out of the way.
- If there's no theme directory at the expected location after
that step, the theme repository is cloned into place
- The task ensures that the origin remote points to the theme's
URL, and fetches from that remote.
- If there are any uncommitted changes in the theme repository
or the current commit appears not to have been pushed, the
task exits with a helpful error.
- The preferred branch or tag is checked out in the theme
repository as before.
(The uninstall, install and post_install hooks are run as before.)
This shouldn't make a difference to deployed instances of Alaveteli
but will be helpful for developers who want to work on developing
a theme.
Fixes #1111.
|
| |\ \ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is a fix for issue #1232. Richard Taylor pointed
out that some PDF attachments had the non-standard content-type
document/pdf, and that these weren't being treated as PDFs.
(Ganesh Sittampalam discovered that all of these PDFs were
generated by a Lexmark X945e, according to the PDF metadata.)
This commit adds an extra case to normalise_content_type to map
document/pdf to application/pdf.
In fact, since the upgrade of the Mail gem in ccebe3c3d6d4dc5f81
the behaviour when handling the non-standard content-type
document/pdf was much better, but this commit also means that
you get the right icon for the attachment, and can be
cherry-picked onto older versions to fix #1232.
|
| |\ \ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Under Ruby 1.8.7, you can parse a CSV file with the
following code (Example A):
require 'csv'
CSV.parse('foo.csv') do |row|
puts "got row: #{row.inspect}"
end
Rather confusingly, under Ruby 1.8.7, CSV.parse can also
take a string representation of the contents of the file
as its parameter, so this also works (Example B):
require 'csv'
CSV.parse("1,hello,red\n2,goodbye,green") do |row|
puts "got row: #{row.inspect}"
end
However under Ruby 1.9.3, CSV.parse only expects a string
representation of the contents of the CSV file, so only
Example B works; Example B fails silently (interpreting
the filename as a single cell CSV file, typically).
The import:import_csv rake task unfortunately relied on
both A and B working. This commit fixes this by adding
PublicBody.import_csv_from_file, and refactoring
PublicBody.import_csv to use the newly added class method,
and adds a test to check for any regression in this
behaviour.
(This means that the usage of import_csv in the admin public
body controller's import_csv action could now be changed
to use PublicBody.import_csv_from_file directly from the
uploaded file, which would be more efficient and cope
with larger files without using lots of memory.)
Fixes #1229
|
| |\ \ \ \ |
|
| | | | | | |
|
| | | |_|/
| |/| | |
|
| |\ \ \ \ |
|
| | |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The subject line wasn't being explicitly specified in
RequestMailer.fake_response and a default of "Fake Response" (somehow
based on the method name) was being used instead; this subject line
would sometimes be visible to users and authorities and caused alarm
to them. Instead, we use the standard subject lines for followup
emails for the InfoRequest.
Fixes #1105.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit 3b86cb6129140fc123dc3aeffcccdb5652f19085.
Conflicts:
Gemfile
The problem with this is the combination of these things:
* bundler's behaviour on seeing a platform that it doesn't understand
is to error, rather than to ignore it:
https://github.com/bundler/bundler/issues/2428
* mySociety's servers currently only have version 1.1.4 of bundler
* The :ruby_20 platform was only introduced in version 1.3.0 of
bundler:
https://github.com/bundler/bundler/blob/master/CHANGELOG.md#130pre3-dec-21-2012
So, for the moment we're just going to revert this change;
upgrading bundler on our servers is a non-trivial job and being
able to deploy on our servers is urgent and important.
|
| |\ \ \ \
| | | | |
| | | | |
| | | | | |
into rails-3-develop
|
| | |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Previously the admin links and permalinks on annotations and incoming
correspondence were reversed, this commit makes the admin link
consistently appear on the left and the permalink thingo appear on the
right.
|
| |/ / / |
|
| |\ \ \
| | | |
| | | |
| | | | |
into rails-3-develop
|
| | | | | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
Gemfile
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The tests of quietly_try_to_purge were failing on Ruby 2.0 due to the
net-http-local gem not working with that Ruby version. When
Net::HTTP::bind is called, it temporarily replaces the open method of
TCPSocket with a version of open that only takes two parameters. The
Ruby 1.9 version of net/http.rb calls TCPSocket.open with two
parameters, but the Ruby 2.0 version calls it with 4, and so fails with
a mismatched number of arguments error.
In fact, net-http-local doesn't seem to be necessary with Ruby 2.0,
where one can supply a :local_port argument to Net::HTTP.start, so this
commit patches lib/quiet_opener.rb to use that approach with Ruby
>= 2.0, and net-http-local on earlier versions.
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
script/switch-theme.rb
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The constrained memory on Micro instances has caused two separate
bug reports on alaveteli-dev, so update the documentation to
discourage people from trying that.
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The code in install.rb and uninstall.rb for a theme that symlinks its
public directory from the main application directory is no longer
needed.
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
rails-3-develop
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
It seems more robust (or certainly easier to understand on reading
the code) to make these paths relative to the Rails root rather
than File.dirname(__FILE__).
|
| | | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
An effect of moving the acts_as_xapian plugin out of vendor/plugins is
that its Rake tasks are no longer found. A fix for this (although
not necessarily the best) is in this commit - load everything in
lib/acts_as_xapian/tasks/*.rake in the Rakefile.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This was the previous behaviour. Setting it explicitly avoids a
deprecation warning.
|
| | |_|_|_|/
|/| | | |
| | | | |
| | | | | |
CVE-2013-6417, CVE-2013-6415.
|
| |\| | | |
| | | | |
| | | | |
| | | | | |
ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
script/rails-post-deploy
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The theme install task would fail if there's an old theme present
in vendor/plugins, since it doesn't try to uninstall the plugin from
that location, only the new location. Then when the install.rb
in the new plugin runs, it'll complain that there's a
public/alavetelitheme symlink already present.
This commit changes themes:install to try to uninstall the plugin
from both locations.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
script/rails-post-deploy
|
| | | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | | |
(An alternative would have been to add an empty lib/themes/.gitkeep
file to this directory, but that makes ignoring the installed themes
more complicated.)
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | | |
rails-3-develop
|
| | | |_|/
| |/| | |
|
| | | | | |
|
| | |/ /
|/| |
| | |
| | | |
Rails 3.2 uses structure.sql for schema dumps
|
| |\ \ \ |
|
| | | | |
| | | |
| | | |
| | | | |
This reverts commit 084cc9574c254cc0af2de4cd615fa99a5be8bc83.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
These are essentially required in exactly the same way as before, but
from lib/themes rather than vendor/plugins. This is the simplest
possible change in order make the themes work outside vendor/plugins,
I think, but it's not necessarily ideal. It would be worth considering
whether these should be changed to Rails engines, as described here:
http://guides.rubyonrails.org/engines.html
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
This includes making making sure that xapiandbs directory is moved
with this version of the code.
|
