aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'rails-3-develop' of ↵Louise Crow2014-08-05-15/+41
|\ | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * Merge branch 'alert-tracks-generator' into rails-3-developGareth Rees2014-08-04-15/+41
| |\
| | * Ensure the log and pid directories existGareth Rees2014-08-04-2/+8
| | | | | | | | | | | | If the directories do not exist the daemon cannot start.
| | * Use correct site name for purge-varnish log and pidGareth Rees2014-08-04-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows the log and pid file names to be set dynamically by the config_files:convert_init_script rake task. ENV[‘SITE’] can be specified to name the particular install – e.g. rather than 'alaveteli' you might name the site 'foi' – so now the log and pid files are created with the correct name rather than simply 'purge-varnish'
| | * Generate purge-varnish pid & log to default locationGareth Rees2014-07-25-3/+3
| | | | | | | | | | | | Deployment system should handle linking the original location to wherever necessary on the specific platform.
| | * Add tmp/pids to example SHARED_DIRECTORIES configGareth Rees2014-07-15-0/+3
| | |
| | * Create tmp/pids in capistrano shared directoryGareth Rees2014-07-15-0/+5
| | | | | | | | | | | | | | | pids need to persist across deploys so that we can kill/restart running processes on deployment
| | * Ensure the log and pid directories existGareth Rees2014-07-15-2/+8
| | | | | | | | | | | | If the directories do not exist the daemon cannot start.
| | * Use correct site name for alert tracks log and pidGareth Rees2014-07-15-5/+7
| | | | | | | | | | | | | | | ENV[‘SITE’] can be specified for the crontab (and elsewhere) so allow the option here too.
| | * Generate alert-tracks pid & log to default locationGareth Rees2014-07-15-5/+6
| | | | | | | | | | | | | | | Deployment system should handle linking the original location to wherever necessary on the specific platform.
| | * Minor tidying of alert-tracks generationGareth Rees2014-07-15-7/+10
| | |
* | | Merge branch 'add-bundler-package-for-squeeze' into rails-3-developLouise Crow2014-08-05-104/+105
|\ \ \ | |/ / |/| |
| * | Add bundler package for squeeze.Louise Crow2014-07-31-0/+1
| | |
| * | Alphabetise package lists.Louise Crow2014-07-31-104/+104
| | |
* | | Merge branch 'issues/1709-eager-load-for-api-speed' into rails-3-developLouise Crow2014-08-04-24/+11
|\ \ \
| * | | Try some eager loading to speed up body_request_eventsLouise Crow2014-08-04-24/+11
| | | |
* | | | Merge branch 'issues/1709-api-controller-speed' into rails-3-developLouise Crow2014-08-04-0/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Add an index for event_type on info_request_eventsSteven Day2014-08-01-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Selecting request events for a particular body is slow because we need to filter the events by event_type and don't currently have an index on that field. This should speed that up. Closes #1709
* | | | Merge branch 'hotfix/0.18.0.10' into rails-3-developLouise Crow2014-07-30-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Add viewport to head when using responsive styles.0.18.0.10hotfix/0.8.0.10Louise Crow2014-07-29-1/+1
| | | |
* | | | Merge branch 'hotfix/0.18.0.9' into rails-3-developLouise Crow2014-07-29-1/+12
|\| | |
| * | | Don't use stylesheet_link_tags0.18.0.9hotfix/0.18.0.9Louise Crow2014-07-29-1/+12
| | | | | | | | | | | | | | | | There attachments will be cached, so we don't want timestamped references to stylesheets.
* | | | Merge branch 'hotfix/0.18.0.8' into rails-3-developLouise Crow2014-07-29-1/+3
|\| | |
| * | | Add min-height for iframe0.18.0.8hotfix/0.18.0.8Louise Crow2014-07-29-1/+3
| |/ /
* | | Merge branch 'issues/1418-update-described-state-via-api' into rails-3-developlizconlan2014-07-28-392/+587
|\ \ \
| * | | whitespacelizconlan2014-07-28-467/+458
| | | | | | | | | | | | | | | | includes various code layout fixes
| * | | Sending an invalid state value to add_correspondence now aborts the entire ↵lizconlan2014-07-28-32/+52
| | | | | | | | | | | | | | | | operation
| * | | Refactor state update API, better error handlinglizconlan2014-07-28-61/+59
| | | | | | | | | | | | | | | | Filters; more 403s, fewer 500s; added logging; less duplication
| * | | Extend add_correspondence API method to optionally accept a state paramlizconlan2014-07-28-86/+157
| | | |
| * | | New API method for updating request statelizconlan2014-07-28-277/+392
|/ / /
* | | Merge branch 'rails-3-develop' of ↵Louise Crow2014-07-16-1/+1
|\ \ \ | | |/ | |/| | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * | Merge branch 'issues/1585-responsive-styling-by-default' into rails-3-developGareth Rees2014-07-15-1/+1
| |\ \
| | * | Set fallback responsitve styling to trueGareth Rees2014-07-11-1/+1
| | | | | | | | | | | | | | | | | | | | 156481f set the default example to true but this ensures the fallback is true.
* | | | Merge branch 'remove-obsolete-fcgi-files' into rails-3-developLouise Crow2014-07-16-6/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove obsolete files.Louise Crow2014-07-16-6/+0
|/ / /
* | | Merge branch 'rails-3-develop' of ↵Louise Crow2014-07-10-28/+25
|\| | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * | Merge branch 'log-config' into rails-3-developGareth Rees2014-07-10-28/+25
| |\ \
| | * | Add upgrade notes for new shared log configurationGareth Rees2014-07-10-0/+18
| | | |
| | * | Add log/ to switch-to-shared scriptGareth Rees2014-07-10-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | script/rails-deploy-before-down will complain if log is listed in the SHARED_DIRECTORIES configuration variable and already exists in APP_ROOT. It will recommend this script be used to migrate to a timestamped deployment structure, so adding log/ makes the transition of the log directory easier.
| | * | Add log directory to shared directoriesGareth Rees2014-07-10-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Now that the install script leaves the log directory alone (a5f79a5) we let the generic mechanism for SHARED_DIRECTORIES handle creating a persisted log directory and symlinking it together.
| | * | Persist log directory across capistrano deploymentsGareth Rees2014-07-10-0/+2
| | | |
| | * | Update log pathsGareth Rees2014-07-10-3/+3
| | | | | | | | | | | | | | | | | | | | Use the standard rails locations. Deployment systems should move the log directory.
| | * | Remove mySociety log handling from install scriptsGareth Rees2014-07-10-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | The deployment system should deal with putting logs in the desired place. As this script gets run on a variety of systems it can cause problems for non-mySociety reinstallers.
* | | | Merge branch 'feature/update-world-foi-sites' into rails-3-developLouise Crow2014-07-10-3/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Update list of world FOI websites.Louise Crow2014-07-08-3/+14
|/ / /
* | | Merge branch 'issues/1226-add-wheezy-details' into rails-3-developLouise Crow2014-07-08-0/+36
|\ \ \
| * | | Add a package list for Debian wheezyMark Longair2014-06-26-0/+36
| | | |
* | | | Merge branch 'feature/responsive-styling-by-default' into rails-3-developLouise Crow2014-07-08-1/+1
|\ \ \ \
| * | | | Now that alavetelitheme has a responsive stylesheet, make this the default.Louise Crow2014-06-10-1/+1
| | | | |
* | | | | Merge branch 'update-url-in-vagrantfile' into rails-3-developLouise Crow2014-07-08-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |