aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
Commit message (Expand)AuthorAgeLines
* Update NewRelic gemGareth Rees2014-08-21-1/+1
* Upgrade Rails versionLouise Crow2014-07-07-27/+27
* Merge branch 'issues/1415-bulk-update-public-bodies' into rails-3-developGareth Rees2014-06-25-2/+0
|\
| * Remove FasterCSV dependencyGareth Rees2014-06-04-2/+0
* | Add quiet_assets gemGareth Rees2014-06-18-0/+3
|/
* Update Gemfile.lockGareth Rees2014-05-28-1/+1
* Merge branch 'hotfix/0.17.0.2' into rails-3-developGareth Rees2014-05-07-29/+29
|\
| * Update rails to 3.2.18Gareth Rees2014-05-07-30/+30
* | Merge remote-tracking branch 'openaustralia_github/upgrade-newrelic' into rai...Louise Crow2014-04-28-1/+1
|\ \
| * | bundle update newrelic_rpmHenare Degan2014-04-25-1/+1
* | | Add foundation-rails gemLouise Crow2014-04-22-0/+4
|/ /
* | use fancybox-rails to provide fancyboxGareth Rees2014-04-07-0/+3
* | Update to rack-ssl 1.3.4Louise Crow2014-04-01-1/+1
|/
* Merge branch 'hotfix/0.16.0.7' into rails-3-developLouise Crow2014-02-19-27/+27
|\
| * Upgrade to latest version of Rails0.16.0.7hotfix/0.16.0.7Louise Crow2014-02-19-27/+27
* | Update will_paginate gem.Louise Crow2013-12-19-1/+1
|/
* Revert "Add byebug, for interactive debugging under Ruby 2"Mark Longair2013-12-09-4/+0
* Merge remote-tracking branch 'openaustralia/ruby-2' into rails-3-developMark Longair2013-12-05-1/+5
|\
| * Add byebug, for interactive debugging under Ruby 2Mark Longair2013-11-22-0/+4
| * `bundle update vpim` for Ruby 2.0 supportHenare Degan2013-11-15-1/+1
* | Upgrade Rails to 3.2.16 to get fixes for CVE-2013-6414, CVE-2013-4491, CVE-20...Louise Crow2013-12-04-28/+28
* | Merge remote-tracking branch 'origin/merged-rails-3-2-assset-pipeline' into r...Louise Crow2013-11-29-52/+80
|\ \
| * \ Merge branch 'feature/rails-3-2-upgrade-spike' into feature/switch-to-asset-p...Mark Longair2013-11-29-58/+55
| |\ \
| | * | Update gems.Louise Crow2013-11-12-58/+55
| | * | WiP: also move admin CSS and images into the asset pipelineMark Longair2013-09-30-1/+3
| | * | WiP: Bundle up admin javascript using the asset pipelineMark Longair2013-09-30-0/+8
| | * | Upgrade sass-railsLouise Crow2013-09-30-7/+9
| | * | Adding rubyracer to supply a js runtimeLouise Crow2013-09-30-0/+6
| | * | Beginning of switch to using the asset pipelineMark Longair2013-09-30-0/+10
| * | | Use the jquery-rails-ui gem, just including the modules we needMark Longair2013-11-26-0/+3
| * | | Update to jquery-rails to a version without jquery-uiMark Longair2013-11-26-2/+2
| * | | Move admin CSS and images into the asset pipelineMark Longair2013-11-19-1/+3
| * | | Bundle up admin javascript using the asset pipelineMark Longair2013-11-19-0/+8
| * | | Upgrade sass-railsLouise Crow2013-11-19-7/+9
| * | | Adding rubyracer to supply a js runtimeLouise Crow2013-11-19-0/+6
| * | | Enable the Rails asset pipeline (Sprockets)Mark Longair2013-11-19-0/+10
* | | | Set cache store to memcached, turn off rack-cache.Louise Crow2013-11-25-0/+2
|/ / /
* | | Also update Gemfile.lock to refer to the upstream globalizeMark Longair2013-11-19-3/+3
* | | Use our own copy of globalize3 for now.Louise Crow2013-11-19-3/+3
* | | Update globalize3 repo.Louise Crow2013-11-18-3/+3
| |/ |/|
* | Merge branch 'install-script' into rails-3-developMark Longair2013-11-07-0/+1
|\ \
| * | Add the Thin web server to the GemfileMark Longair2013-10-29-0/+1
| |/
* | Switch to unidecoder gemLouise Crow2013-10-21-2/+2
* | Upgrade new relic gem to get new tracing featuresMatthew Landauer2013-10-17-1/+1
|/
* Merge branch 'feature/hide-individual-responses' into rails-3-developLouise Crow2013-09-17-0/+6
|\
| * Downgrade factory_girl for ruby 1.8.7Louise Crow2013-09-16-5/+5
| * Add factory_girl gemLouise Crow2013-09-16-0/+6
* | Merge branch 'public-body-locale-fallback' into rails-3-developLouise Crow2013-09-12-0/+1
|\ \
| * | Don't display duplicate public bodies with the fallbackMark Longair2013-09-12-0/+1
* | | Merge branch 'body-statistics' into rails-3-developLouise Crow2013-09-04-0/+2
|\ \ \ | |/ / |/| |