Skip to content

Commit

Permalink
Merge branch 'hotfix/v1.7.2' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Ismail Akbudak committed Aug 26, 2015
2 parents 2868dfd + 607fd19 commit b9b282e
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 18 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@

#### [Current]
* [81533c0](../../commit/81533c0) - __(Ismail Akbudak)__ Bump version v1.7.2
* [90eef0f](../../commit/90eef0f) - __(Ismail Akbudak)__ fix warning on build gemspec

#### v1.7.1
* [e8ad41a](../../commit/e8ad41a) - __(Ismail Akbudak)__ update changelog
* [0921829](../../commit/0921829) - __(Ismail Akbudak)__ Bump version v1.7.1
* [8d94293](../../commit/8d94293) - __(Ismail Akbudak)__ Update ruby and rails versions

#### v1.7.0
* [d31374d](../../commit/d31374d) - __(Tayfun Öziş ERİKAN)__ Bump version v1.7.0
* [81358eb](../../commit/81358eb) - __(Tayfun Öziş ERİKAN)__ Some typos were fixed
* [0918eb6](../../commit/0918eb6) - __(Tayfun Öziş ERİKAN)__ Gemfile.lock was removed
Expand Down
31 changes: 15 additions & 16 deletions cybele.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,25 @@ require File.expand_path('../lib/cybele/version', __FILE__)
require 'date'

Gem::Specification.new do |spec|
spec.name = 'cybele'
spec.version = Cybele::VERSION
spec.authors = %w[lab2023]
spec.email = %w[[email protected]]
spec.description = %q{Rails 4.x template with responder, simple form, haml, exception notification, etc etc ...}
spec.summary = %q{Rails 4.x template with responder, simple form, haml, exception notification, etc etc ...}
spec.homepage = 'https://github.com/kebab-project/cybele'
spec.license = 'MIT'
spec.date = Date.today.strftime('%Y-%m-%d')

spec.required_ruby_version = ">= #{Cybele::RUBY_VERSION}"
spec.add_dependency 'bundler', '~> 1.5'
spec.add_dependency 'rails', Cybele::RAILS_VERSION

spec.files = `git ls-files`.split($/)
spec.executables = %w[cybele]
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths= %w[lib]
spec.name = 'cybele'
spec.version = Cybele::VERSION
spec.authors = %w[lab2023]
spec.email = %w[[email protected]]
spec.description = %q{Rails 4.x template with responder, simple form, haml, exception notification, etc etc ...}
spec.summary = %q{Rails 4.x template with responder, simple form, haml, exception notification, etc etc ...}
spec.homepage = 'https://github.com/kebab-project/cybele'
spec.license = 'MIT'
spec.date = Date.today.strftime('%Y-%m-%d')
spec.files = `git ls-files`.split($/)
spec.executables = %w[cybele]
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = %w[lib]

spec.add_development_dependency 'rake'
spec.add_dependency 'bundler', '~> 1.5'
spec.add_dependency 'rails', Cybele::RAILS_VERSION

spec.extra_rdoc_files = %w[README.md MIT-LICENSE]
end
4 changes: 2 additions & 2 deletions lib/cybele/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Cybele
RAILS_VERSION = '~> 4.2.4'
RAILS_VERSION = '~> 4.2.0'
RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
VERSION = '1.7.1'
VERSION = '1.7.2'
end

0 comments on commit b9b282e

Please sign in to comment.