Skip to content

Commit

Permalink
Merge pull request #5566 from activeadmin/get_ready_for_1.4.0_release
Browse files Browse the repository at this point in the history
Get ready for 1.4.0 release
  • Loading branch information
deivid-rodriguez committed Nov 18, 2018
2 parents f9949bf + 3516e09 commit 3329f89
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## 1.4.0 (unreleased)
## 1.4.0 [](https://github.com/activeadmin/activeadmin/compare/v1.3.1...v1.4.0)

### Enhancements

Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
activeadmin (1.3.1)
activeadmin (1.4.0)
arbre (>= 1.1.1)
coffee-rails
formtastic (~> 3.1)
Expand Down Expand Up @@ -300,7 +300,7 @@ GEM
rainbow (2.2.2)
rake
rake (12.3.1)
ransack (2.0.1)
ransack (2.1.0)
actionpack (>= 5.0)
activerecord (>= 5.0)
activesupport (>= 5.0)
Expand Down Expand Up @@ -342,7 +342,7 @@ GEM
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.10.0)
rubyzip (1.2.2)
sass (3.6.0)
sass (3.7.2)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails_42.gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ..
specs:
activeadmin (1.3.1)
activeadmin (1.4.0)
arbre (>= 1.1.1)
coffee-rails
formtastic (~> 3.1)
Expand Down Expand Up @@ -326,7 +326,7 @@ GEM
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.10.0)
rubyzip (1.2.2)
sass (3.6.0)
sass (3.7.2)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand Down
6 changes: 3 additions & 3 deletions gemfiles/rails_50.gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ..
specs:
activeadmin (1.3.1)
activeadmin (1.4.0)
arbre (>= 1.1.1)
coffee-rails
formtastic (~> 3.1)
Expand Down Expand Up @@ -293,7 +293,7 @@ GEM
rainbow (2.2.2)
rake
rake (12.3.1)
ransack (2.0.1)
ransack (2.1.0)
actionpack (>= 5.0)
activerecord (>= 5.0)
activesupport (>= 5.0)
Expand Down Expand Up @@ -335,7 +335,7 @@ GEM
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.10.0)
rubyzip (1.2.2)
sass (3.6.0)
sass (3.7.2)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand Down
6 changes: 3 additions & 3 deletions gemfiles/rails_51.gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ..
specs:
activeadmin (1.3.1)
activeadmin (1.4.0)
arbre (>= 1.1.1)
coffee-rails
formtastic (~> 3.1)
Expand Down Expand Up @@ -292,7 +292,7 @@ GEM
rainbow (2.2.2)
rake
rake (12.3.1)
ransack (2.0.1)
ransack (2.1.0)
actionpack (>= 5.0)
activerecord (>= 5.0)
activesupport (>= 5.0)
Expand Down Expand Up @@ -334,7 +334,7 @@ GEM
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.10.0)
rubyzip (1.2.2)
sass (3.6.0)
sass (3.7.2)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand Down
2 changes: 1 addition & 1 deletion lib/active_admin/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module ActiveAdmin
VERSION = '1.3.1'
VERSION = '1.4.0'
end

0 comments on commit 3329f89

Please sign in to comment.