diff options
| author | Harald Eilertsen <haraldei@anduin.net> | 2018-09-02 11:59:03 +0200 |
|---|---|---|
| committer | Harald Eilertsen <haraldei@anduin.net> | 2018-09-02 11:59:03 +0200 |
| commit | f608dd53b256d320d749715ca15632eb27b9a97e (patch) | |
| tree | 62c59913e210870ee35f51111e5bab1e3adc6935 /Gemfile.lock | |
| parent | e524675fd9504b7bb55153cc8e57f9e60e8d088e (diff) | |
| download | hmnoweb-f608dd53b256d320d749715ca15632eb27b9a97e.tar.gz hmnoweb-f608dd53b256d320d749715ca15632eb27b9a97e.tar.bz2 hmnoweb-f608dd53b256d320d749715ca15632eb27b9a97e.zip | |
Fix postgresql adapter fluke.
Drop explicit import of activerecord-postgresql-adapter, and limit pg gem
to a compatible version. Hopefully this will do the trick...
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c2cd4f2..e2a68aa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -60,8 +60,6 @@ GEM activesupport (= 3.2.22.5) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activerecord-postgresql-adapter (0.0.1) - pg activeresource (3.2.22.5) activemodel (= 3.2.22.5) activesupport (= 3.2.22.5) @@ -141,7 +139,7 @@ GEM net-ssh (>= 2.6.5) net-ssh (5.0.2) orm_adapter (0.5.0) - pg (1.0.0) + pg (0.21.0) piwik_analytics (1.0.2) actionpack activesupport @@ -283,7 +281,6 @@ PLATFORMS DEPENDENCIES SyslogLogger - activerecord-postgresql-adapter bcrypt-ruby (~> 3.0.0) byebug capistrano (~> 3.10.0) @@ -294,7 +291,7 @@ DEPENDENCIES coffee-rails (~> 3.2) jquery-rails (~> 2.3.0) lorem - pg + pg (~> 0.11) piwik_analytics (~> 1.0.2) puma rails (~> 3.2) @@ -316,4 +313,4 @@ DEPENDENCIES uglifier (>= 1.0.3) BUNDLED WITH - 1.16.2 + 1.16.4 |