Skip to content

Commit

Permalink
Merge pull request #57 from verypossible/patch/update-dependency
Browse files Browse the repository at this point in the history
Bump paperclip dependency
  • Loading branch information
Mrjaco12 committed Jan 26, 2018
2 parents 7853e91 + 2f89bdc commit 166c8e5
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,18 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [0.4.0]
### Updated
- Update Paperclip dependency
- Updated example in Readme for paperclip

[0.4.0]: https://github.com/verypossible/atomic_cms/compare/v0.3.2...v0.4.0

## [0.2.5]
### Added
- Changelog for tracking releases

### Updated
- Sass files to remove css to fix deprecation warnings

[0.2.5]: https://github.com/spartansystems/atomic_cms/compare/v0.2.3...v0.2.5
[0.2.5]: https://github.com/verypossible/atomic_cms/compare/v0.2.3...v0.2.5
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ intervention. Below are instructions for getting started.
After initializing a new Rails application, or adding to an existing
application, add the following gems to your Gemfile.
```ruby
gem 'atomic_cms', github: 'spartansystems/atomic_cms'
gem 'atomic_cms', github: 'verypossible/atomic_cms'
gem 'devise'
```
_Note: devise is optional if you do not want admin users to login._
Expand Down Expand Up @@ -92,7 +92,7 @@ class Application < Rails::Application
bucket: ENV.fetch("AWS_S3_BUCKET", ""),
access_key_id: ENV.fetch("AWS_ACCESS_KEY", ""),
secret_access_key: ENV.fetch("AWS_SECRET", ""),
s3_host_name: "s3-#{ENV.fetch('AWS_REGION', '')}.amazonaws.com"
s3_region: ENV.fetch("AWS_REGION", ""),
}
}
...
Expand Down
4 changes: 2 additions & 2 deletions atomic_cms.gemspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = 'atomic_cms'
s.version = '0.3.3'
s.version = '0.4.0'
s.summary = 'Atomic CMS'
s.description = 'Live CMS powered by atomic assets.'
s.authors = ['Don Humphreys', 'Very']
Expand All @@ -16,7 +16,7 @@ Gem::Specification.new do |s|
s.add_dependency 'jquery-rails', '~> 4.0', '>= 4.0.3'
s.add_dependency 'redcarpet', '~> 3.3'
s.add_dependency 'slim-rails', '~> 3.0'
s.add_dependency 'paperclip', '~> 4.3'
s.add_dependency 'paperclip', '~> 5.2'

s.add_development_dependency 'rspec-core', '~> 3.3'
s.add_development_dependency 'rspec-expectations', '~> 3.3'
Expand Down

0 comments on commit 166c8e5

Please sign in to comment.