GitHub-Mirror/huginn
2
0
Fork 0
mirror of https://github.com/Fishwaldo/huginn.git synced 2025-03-15 19:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2384 from dsander/upgrade-database-gems

Browse source 
Upgrade mysql and pg gems
This commit is contained in:
Akinori MUSHA 2018-10-03 23:29:32 +09:00 • committed by GitHub
commit 26630c491a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -2,6 +2,7 @@
| DateOfChange | Changes | | DateOfChange | Changes |
|----------------|--------------------------------------------------------------------------------------------------------------| |----------------|--------------------------------------------------------------------------------------------------------------|
| Oct 03, 2018 | Added support for MySQL 8 and MariaDB 10.3. Dropped support for MySQL < 5.5 and PostgreSQL < 9.2 [2384](https://github.com/huginn/huginn/pull/2384) |
| Sep 15, 2017 | Tweets view of `TwitterStreamAgent` has been enhanced. [2122](https://github.com/huginn/huginn/pull/2122) | | Sep 15, 2017 | Tweets view of `TwitterStreamAgent` has been enhanced. [2122](https://github.com/huginn/huginn/pull/2122) |
| Sep 09, 2017 | Agent objects in Liquid templating now have new properties `working` and `url`. [2118](https://github.com/huginn/huginn/pull/2118) | | Sep 09, 2017 | Agent objects in Liquid templating now have new properties `working` and `url`. [2118](https://github.com/huginn/huginn/pull/2118) |
| Sep 06, 2017 | `DataOutputAgent` includes an icon in a podcast feed. [2114](https://github.com/huginn/huginn/pull/2114) | | Sep 06, 2017 | `DataOutputAgent` includes an icon in a podcast feed. [2114](https://github.com/huginn/huginn/pull/2114) |

4
Gemfile
View file

@ -200,11 +200,11 @@ ENV['DATABASE_ADAPTER'] ||=
end end
if_true(ENV['DATABASE_ADAPTER'].strip == 'postgresql') do if_true(ENV['DATABASE_ADAPTER'].strip == 'postgresql') do
gem 'pg', '~> 0.18.3' gem 'pg', '~> 1.1.3'
end end
if_true(ENV['DATABASE_ADAPTER'].strip == 'mysql2') do if_true(ENV['DATABASE_ADAPTER'].strip == 'mysql2') do
gem 'mysql2', ">= 0.3.18", "< 0.5" gem 'mysql2' , "~> 0.5.2"
end end
GemfileHelper.parse_each_agent_gem(ENV['ADDITIONAL_GEMS']) do |args| GemfileHelper.parse_each_agent_gem(ENV['ADDITIONAL_GEMS']) do |args|

8
Gemfile.lock
View file

@ -407,7 +407,7 @@ GEM
multi_json (1.13.1) multi_json (1.13.1)
multi_xml (0.6.0) multi_xml (0.6.0)
multipart-post (2.0.0) multipart-post (2.0.0)
mysql2 (0.4.8) mysql2 (0.5.2)
naught (1.1.0) naught (1.1.0)
nenv (0.3.0) nenv (0.3.0)
net-ftp-list (3.2.8) net-ftp-list (3.2.8)
@ -455,7 +455,7 @@ GEM
omniauth-oauth2 (~> 1.1) omniauth-oauth2 (~> 1.1)
orm_adapter (0.5.0) orm_adapter (0.5.0)
os (0.9.6) os (0.9.6)
pg (0.18.3) pg (1.1.3)
poltergeist (1.8.1) poltergeist (1.8.1)
capybara (~> 2.1) capybara (~> 2.1)
cliver (~> 0.3.1) cliver (~> 0.3.1)
@ -723,7 +723,7 @@ DEPENDENCIES
mini_magick mini_magick
mqtt mqtt
multi_xml multi_xml
mysql2 (>= 0.3.18, < 0.5) mysql2 (~> 0.5.2)
net-ftp-list (~> 3.2.8) net-ftp-list (~> 3.2.8)
nokogiri nokogiri
omniauth (~> 1.6.1) omniauth (~> 1.6.1)
@ -733,7 +733,7 @@ DEPENDENCIES
omniauth-tumblr (~> 1.2) omniauth-tumblr (~> 1.2)
omniauth-twitter (~> 1.3.0) omniauth-twitter (~> 1.3.0)
omniauth-wunderlist omniauth-wunderlist
pg (~> 0.18.3) pg (~> 1.1.3)
poltergeist poltergeist
pry-byebug pry-byebug
pry-rails pry-rails