Skip to content

Commit 8c4f399

Browse files
author
Cuong Tran
committed
Merge branch 'release/2.6.0'
2 parents 8b61b6b + da8100a commit 8c4f399

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

README.rdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Also, if you pass the -r option, it'll annotate routes.rb with the output of
5050

5151
Into Gemfile from rubygems.org:
5252

53-
gem 'annotate', ">=2.5.0"
53+
gem 'annotate', ">=2.6.0"
5454

5555
Into Gemfile from Github:
5656

annotate.gemspec

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,20 @@
44

55
Gem::Specification.new do |s|
66
s.name = "annotate"
7-
s.version = "2.6.0.beta2"
7+
s.version = "2.6.0"
88

9-
s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
109
s.authors = ["Cuong Tran", "Alex Chaffee", "Marcos Piccinini", "Turadg Aleahmad", "Jon Frisby"]
11-
s.date = "2013-06-21"
10+
s.date = "2013-11-29"
1211
s.description = "Annotates Rails/ActiveRecord Models, routes, fixtures, and others based on the database schema."
1312
1413
s.executables = ["annotate"]
1514
s.extra_rdoc_files = ["README.rdoc", "CHANGELOG.rdoc", "TODO.rdoc"]
16-
s.files = ["CHANGELOG.rdoc", "README.rdoc", "TODO.rdoc", "annotate.gemspec", "bin/annotate", "lib/annotate.rb", "lib/annotate/active_record_patch.rb", "lib/annotate/annotate_models.rb", "lib/annotate/annotate_routes.rb", "lib/annotate/tasks.rb", "lib/annotate/version.rb", "lib/generators/annotate/USAGE", "lib/generators/annotate/install_generator.rb", "lib/generators/annotate/templates/auto_annotate_models.rake", "lib/tasks/annotate_models.rake", "lib/tasks/annotate_routes.rake", "tasks/migrate.rake"]
15+
s.files = ["AUTHORS.rdoc", "CHANGELOG.rdoc", "README.rdoc", "TODO.rdoc", "annotate.gemspec", "bin/annotate", "lib/annotate.rb", "lib/annotate/active_record_patch.rb", "lib/annotate/annotate_models.rb", "lib/annotate/annotate_routes.rb", "lib/annotate/tasks.rb", "lib/annotate/version.rb", "lib/generators/annotate/USAGE", "lib/generators/annotate/install_generator.rb", "lib/generators/annotate/templates/auto_annotate_models.rake", "lib/tasks/annotate_models.rake", "lib/tasks/annotate_routes.rake", "tasks/migrate.rake"]
1716
s.homepage = "http://github.com/ctran/annotate_models"
1817
s.licenses = ["Ruby"]
1918
s.require_paths = ["lib"]
2019
s.rubyforge_project = "annotate"
21-
s.rubygems_version = "2.0.3"
20+
s.rubygems_version = "2.0.6"
2221
s.summary = "Annotates Rails Models, routes, fixtures, and others based on the database schema."
2322

2423
if s.respond_to? :specification_version then

lib/annotate/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Annotate
22
def self.version
3-
'2.6.0.beta2'
3+
'2.6.0'
44
end
55
end

0 commit comments

Comments
 (0)