Skip to content

Commit 104a76e

Browse files
committed
update version number to 2.5.0
1 parent 076e778 commit 104a76e

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

History.txt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Works better with Rails 3
44
* Bugfix: schema kept prepending additional newlines
55
* Updates to make annotate smarter about when to touch a model
6-
* Recognize column+type, and don't change a file unless the column+type combination of the new schema are different than that of the old (i.e., don't regenerate if columns happen to be in a different order. That's just how life is sometimes)
6+
* Recognize column+type, and don't change a file unless the column+type combination of the new schema are different than that of the old (i.e., don't regenerate if columns happen to be in a different order. That's just how life is sometimes.)
77
* Grab old specification even if it has \r\n as line endings rather than pure \ns
88
* Various warning and specification fixes
99
* Fix "no such file to load -- annotate/annotate_models (MissingSourceFile)" error (require statements in tasks now use full path to lib files)
@@ -17,7 +17,6 @@
1717
* Leave magic encoding comment intact
1818
* Fix issue #14 - RuntimeError: Already memoized
1919
* Count a model as 'annotated' if any of its tests/fixtures are annotated
20-
* Support FactoryGirl
2120
* Support :change migrations (Rails 3.1)
2221
* Allow models with non-standard capitalization
2322
* Widen type column so we can handle longtexts with chopping things off.
@@ -39,13 +38,10 @@
3938
non-standard capitalization.
4039
Note that this still requires that the inflector be configured to understand
4140
the special case.
42-
* Shore up test cases a bit.
4341
* Merge against many of the older branches on Github whose functionality is
4442
already reflected to reduce confusion about what is and is not implemented
4543
here.
4644
* Accept String or Symbol for :position (et al) options.
47-
* Rename "annotate" bin to "annotate_models" to avoid conflicting with
48-
ImageMagick.
4945
* Add RDoc output formatting as an option.
5046
* Add Markdown output formatting as an option.
5147
* Add option to force annotation regeneration.
@@ -58,10 +54,12 @@
5854
* Fix handling of files with no trailing newline when putting annotations at
5955
the end of the file.
6056
* Now works on tables with no primary key.
61-
* Add --format=markdown option
57+
* --format=markdown option
58+
* --trace option to help debug "Unable to annotate" errors
6259
* "Table name" annotation (if table name is different from model name)
6360
* "Human name" annotation (enabling translation to non-English locales)
64-
* --trace option to help debug "Unable to annotate" errors
61+
* Fix JRuby ObjectSpace compatibility bug (https://github.com/ctran/annotate_models/pull/85)
62+
* Fix FactoryGirl compatibility bug (https://github.com/ctran/annotate_models/pull/82)
6563

6664
== 2.4.2 2009-11-21
6765

README.rdoc

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

4444
Into Gemfile from rubygems.org:
4545

46-
gem 'annotate', ">=2.5.0.pre1"
46+
gem 'annotate', ">=2.5.0"
4747

4848
Into Gemfile from Github:
4949

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.5.0.pre3"
3+
"2.5.0"
44
end
55
end

0 commit comments

Comments
 (0)