Skip to content

Commit

Permalink
Merge branch 'release/v1.6.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
odinsride committed Mar 8, 2020
2 parents 4ecb64f + 6da39b5 commit a0cad26
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 21 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased] changes

## [v1.6.1] - 2020-03-08

## Changed
- puma bumped to 4.3.3
- nokogiri bumped to 1.10.8
- Other gems updated

## [v1.6.0] - 2020-02-05

## Added
Expand Down Expand Up @@ -160,7 +167,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Account overview with list of all accounts and balances for each


[Unreleased]: https://github.com/odinsride/olubalance/compare/v1.6.0...HEAD
[Unreleased]: https://github.com/odinsride/olubalance/compare/v1.6.1...HEAD
[v1.6.1]: https://github.com/odinsride/olubalance/compare/v1.6.0...v1.6.1
[v1.6.0]: https://github.com/odinsride/olubalance/compare/v1.5.0...v1.6.0
[v1.5.0]: https://github.com/odinsride/olubalance/compare/v1.4.5...v1.5.0
[v1.4.5]: https://github.com/odinsride/olubalance/compare/v1.4.2...v1.4.5
Expand Down
40 changes: 20 additions & 20 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -64,23 +64,23 @@ GEM
public_suffix (>= 2.0.2, < 5.0)
ast (2.4.0)
aws-eventstream (1.0.3)
aws-partitions (1.269.0)
aws-sdk-core (3.89.1)
aws-partitions (1.281.0)
aws-sdk-core (3.90.1)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.28.0)
aws-sdk-kms (1.29.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.60.1)
aws-sdk-s3 (1.60.2)
aws-sdk-core (~> 3, >= 3.83.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.0)
aws-sigv4 (1.1.1)
aws-eventstream (~> 1.0, >= 1.0.2)
bcrypt (3.1.13)
better_errors (2.5.1)
better_errors (2.6.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
Expand All @@ -97,7 +97,7 @@ GEM
regexp_parser (~> 1.5)
xpath (~> 3.2)
coderay (1.1.2)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.6)
crass (1.0.6)
database_cleaner (1.7.0)
debug_inspector (0.0.3)
Expand All @@ -124,7 +124,7 @@ GEM
railties (>= 4.2.0)
faker (2.9.0)
i18n (>= 1.6, < 1.8)
ffi (1.12.1)
ffi (1.12.2)
figaro (1.1.1)
thor (~> 0.14)
font-awesome-rails (4.7.0.5)
Expand All @@ -142,7 +142,6 @@ GEM
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
turbolinks
json (2.3.0)
listen (3.2.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
Expand All @@ -160,12 +159,12 @@ GEM
mini_portile2 (2.4.0)
minitest (5.14.0)
nio4r (2.5.2)
nokogiri (1.10.8)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0)
pagy (3.7.2)
pagy (3.7.3)
parallel (1.19.1)
parser (2.7.0.2)
parser (2.7.0.4)
ast (~> 2.4.0)
pg (1.1.4)
pry (0.12.2)
Expand All @@ -179,7 +178,7 @@ GEM
public_suffix (4.0.3)
puma (4.3.3)
nio4r (~> 2.0)
rack (2.1.2)
rack (2.2.2)
rack-proxy (0.6.5)
rack
rack-test (1.1.0)
Expand Down Expand Up @@ -221,12 +220,13 @@ GEM
rb-fsevent (0.10.3)
rb-inotify (0.10.1)
ffi (~> 1.0)
regexp_parser (1.6.0)
regexp_parser (1.7.0)
request_store (1.5.0)
rack (>= 1.4)
responders (3.0.0)
actionpack (>= 5.0)
railties (>= 5.0)
rexml (3.2.4)
rspec-core (3.9.1)
rspec-support (~> 3.9.1)
rspec-expectations (3.9.0)
Expand All @@ -244,11 +244,12 @@ GEM
rspec-mocks (~> 3.9.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.2)
rubocop (0.79.0)
rubocop (0.80.1)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.7.0.1)
rainbow (>= 2.2.2, < 4.0)
rexml
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
rubocop-rails (2.4.2)
Expand All @@ -265,11 +266,10 @@ GEM
tilt
shoulda-matchers (4.1.2)
activesupport (>= 4.2.0)
simplecov (0.17.1)
simplecov (0.18.5)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
simplecov-html (~> 0.11)
simplecov-html (0.12.2)
spring (2.1.0)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
Expand Down Expand Up @@ -303,7 +303,7 @@ GEM
websocket-extensions (0.1.4)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.2.2)
zeitwerk (2.3.0)

PLATFORMS
ruby
Expand Down

0 comments on commit a0cad26

Please sign in to comment.