Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Jun 10, 2012
  1. @alexch

    Merge pull request #81 from kevmoo/patch-3

    alexch authored
    Removing reference to VERSION.yml from gemspec (again)
Commits on Jun 9, 2012
  1. @alexch

    update readme

    alexch authored
  2. @alexch

    fix bugs against Rails 2.3.14

    alexch authored
  3. @alexch

    Revert "Changed to sort be default with an option to not sort."

    alexch authored
    This reverts commit 8d3c00c.
    
    Sorry, but database order should be the default unless a user really wants it alphabetized. (We should also allow a .annotate file so users can set their own preferred options more easily.)
    
    Conflicts:
    
    	.gitignore
    	bin/annotate
    	lib/annotate/annotate_models.rb
    	lib/tasks/annotate_models.rake
Commits on Jun 8, 2012
  1. @alexch
  2. @alexch
  3. @kevmoo

    Removing reference to VERSION.yml from gemspec

    kevmoo authored
    It no longer exists
  4. @alexch
  5. @alexch

    Merge branch 'master' of github.com:ctran/annotate_models

    alexch authored
    Conflicts:
    	lib/annotate/annotate_models.rb
Commits on May 10, 2012
  1. @alexch

    Merge pull request #79 from phallstrom/master

    alexch authored
    One line patch to sort the indexes by name.
Commits on May 9, 2012
  1. @phallstrom
Commits on Mar 26, 2012
  1. @alexch
Commits on Mar 24, 2012
  1. @alexch
  2. @alexch

    fix up readme

    alexch authored
  3. @alexch

    move version out of VERSION.yml and into version.rb (to remove yaml d…

    alexch authored
    …ependency and some messy code)
  4. @alexch

    Merge branch 'mrjoy'

    alexch authored
    * mrjoy: (177 commits)
      Updating authorship.
      Resolve conflict between generated rakefile and CLI tool.
      Minor fixups.
      Updating readme to be RDoc compliant.
      fixed a few typos
      Updating docs to point to this fork.
      Update docs.
      Yep, I'm tired.
      Revert "Version bump to 0.0.0"
      Version bump to 0.0.0
      Changing my mind on project name issue...
      Making project name match Github project name.
      Bumping version.
      Wider type column output, play nice with Rake CLI.
      Fixing behavior with some model sub-classes, adding skip-annotations feature.
      Making ActiveSupport dependency float, updating gemspec.
      Updating change log, readme and TODO list.
      Update generated .rake file with new options.
      Renaming bin to avoid conflict with ImageMagick.
      Accept string or symbol for positions.
      ...
    
    Conflicts:
    	Gemfile
    	Gemfile.lock
    	History.txt
    	README.rdoc
    	Rakefile
    	VERSION.yml
    	annotate.gemspec
    	annotate_models.gemspec
    	lib/annotate/annotate_models.rb
    	lib/tasks/annotate_models.rake
    	lib/tasks/annotate_routes.rake
    	spec/annotate/annotate_models_spec.rb
    	spec/spec_helper.rb
    	todo.txt
  5. @alexch
  6. @alexch

    Merge branch 'ctran'

    alexch authored
    * ctran: (23 commits)
      Inserting newline requires double-quoted string
      Annotation position defaulted to 'before'. Bugfix: annotate_models.rake uses string instead of symbol.
      include ActiveSupport to finish build #45
      include lib specs
      specify :rubygems source in Gemfile for Travis
      Gemfile for dependencies for Travis CI rake
      make the specs pass (one pending)
      fix column pattern
      Allow task loading from Rakefile for gems (plugin installation already auto-detects). Add skip_on_db_migrate option as well for people that don't want it.
      Fix options parsing to convert strings to proper booleans. Change annotate to use options hash instead of ENV.
      Update README.rdoc to mention Fabrication support
      Add support for Fabrication fabricators
      We had stripped the trailing newlines from our Schema Information section. This small fix supports that case.
      rake task is 'build', not 'gem'
      match indexes and column options too when comparing annotation headers
      Leave magic encoding comment intact
      Fixes issue #14 - RuntimeError: Already memoized
      Count a model as 'annotated' if any of its tests/fixtures are annotated
      Implement FactoryGirl (#47)
      fix gemspec and get rspecs partly working again
      ...
    
    Conflicts:
    	Gemfile
    	Rakefile
    	VERSION.yml
    	annotate.gemspec
    	lib/tasks/annotate_models.rake
    	spec/annotate/annotate_models_spec.rb
    	spec/spec_helper.rb
  7. @alexch
  8. @alexch
  9. @alexch
  10. @alexch
  11. @alexch

    add rubygems source to Gemfile

    alexch authored
Commits on Mar 22, 2012
  1. @ctran

    Merge pull request #76 from ffmike/master

    ctran authored
    Fixed a bug in "after" annotations
Commits on Mar 21, 2012
  1. @MrJoy

    Updating authorship.

    MrJoy authored
Commits on Mar 19, 2012
  1. @ffmike
Commits on Mar 1, 2012
  1. @MrJoy
  2. @MrJoy

    Minor fixups.

    MrJoy authored
  3. @MrJoy

    Merge remote-tracking branch 'brentgreeff/master' into development

    MrJoy authored
    Conflicts:
    	annotate.gemspec
    	lib/annotate.rb
    	lib/annotate/annotate_models.rb
    	lib/tasks/annotate_models.rake
    	lib/tasks/annotate_routes.rake
  4. @MrJoy

    Merge remote-tracking branch 'appsinyourpants/restart' into development

    MrJoy authored
    Conflicts:
    	lib/annotate/annotate_models.rb
  5. @MrJoy
  6. @MrJoy

    Merge remote-tracking branch 'appsinyourpants/master' into development

    MrJoy authored
    Conflicts:
    	.gitignore
    	Gemfile
    	Gemfile.lock
    	README.rdoc
    	Rakefile
    	VERSION.yml
    	annotate.gemspec
    	bin/annotate_models
    	lib/annotate.rb
    	lib/annotate/annotate_routes.rb
    	lib/tasks/annotate_models.rake
    	lib/tasks/annotate_routes.rake
    	spec/annotate_models_spec.rb
    	spec/spec_helper.rb
  7. @MrJoy

    fixed a few typos

    MrJoy authored
    Conflicts:
    
    	lib/annotate/annotate_models.rb
  8. @MrJoy
  9. @MrJoy

    Merge remote-tracking branch 'thermistor/netsign' into development

    MrJoy authored
    Conflicts:
    	Rakefile
    	VERSION.yml
    	annotate.gemspec
    	lib/tasks/annotate_models.rake
Something went wrong with that request. Please try again.