Skip to content
Commits on Jul 11, 2015
  1. @vijaydev
Commits on May 8, 2015
  1. @vijaydev
Commits on Mar 26, 2015
  1. @vijaydev

    Merge branch 'master' of github.com:rails/docrails

    vijaydev committed
    Conflicts:
    	guides/source/4_0_release_notes.md
Commits on Aug 19, 2014
  1. @vijaydev

    Merge branch 'master' of github.com:rails/docrails

    vijaydev committed
    Conflicts:
    	actionpack/lib/action_controller/metal/mime_responds.rb
    	actionview/lib/action_view/vendor/html-scanner/html/sanitizer.rb
    	activerecord/lib/active_record/type/value.rb
Commits on Aug 2, 2014
  1. @vijaydev

    Merge branch 'master' of github.com:rails/docrails

    vijaydev committed
    Conflicts:
    	guides/source/testing.md
Commits on Feb 16, 2014
  1. @vijaydev

    Merge pull request #13937 from ktaragorn/guides_fixes

    vijaydev committed
    Guides fixes
Commits on Feb 11, 2014
  1. @vijaydev

    Merge pull request #13571 from bak/getting_started_guide

    vijaydev committed
    A pass over the Getting Started guide sections 1, 2, and 3 [ci skip]
Commits on Sep 28, 2013
  1. @vijaydev
Commits on Aug 17, 2013
  1. @vijaydev

    Merge branch 'master' of github.com:rails/docrails

    vijaydev committed
    Conflicts:
    	actionview/README.rdoc
    	activerecord/lib/active_record/migration.rb
    	guides/source/development_dependencies_install.md
    	guides/source/getting_started.md
Commits on Jul 21, 2013
  1. @vijaydev
Commits on Jun 26, 2013
  1. @vijaydev

    Merge branch 'master' of github.com:lifo/docrails

    vijaydev committed
    Conflicts:
    	guides/source/layout.html.erb
Commits on Jun 13, 2013
  1. @vijaydev

    Merge branch 'master' of github.com:lifo/docrails

    vijaydev committed
    Conflicts:
    	guides/source/upgrading_ruby_on_rails.md
Commits on Mar 30, 2013
  1. @vijaydev

    Merge branch 'master' of github.com:lifo/docrails

    vijaydev committed
    Conflicts:
    	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
    	activerecord/test/cases/adapter_test.rb
    	guides/source/testing.md
    
    [ci skip]
Commits on Jan 8, 2013
  1. @vijaydev

    Merge branch 'master' of github.com:lifo/docrails

    vijaydev committed
    Conflicts:
    	guides/source/getting_started.md
Commits on Dec 8, 2012
  1. @vijaydev

    Revert "Introduce Bundler and Gemfiles in a NOTE"

    vijaydev committed
    This reverts commit 83cb6fb.
    
    Reason: very trivial
    
    [ci skip]
Commits on Oct 10, 2012
  1. @vijaydev

    Merge branch 'master' of github.com:lifo/docrails

    vijaydev committed
    Conflicts:
    	activerecord/lib/active_record/persistence.rb
    	railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
Commits on Sep 21, 2012
  1. @vijaydev
  2. @vijaydev

    Merge branch 'master' of github.com:lifo/docrails

    vijaydev committed
    Conflicts:
    	actionmailer/lib/action_mailer/base.rb
    	activesupport/lib/active_support/configurable.rb
    	activesupport/lib/active_support/core_ext/module/deprecation.rb
    	guides/source/action_controller_overview.md
    	guides/source/active_support_core_extensions.md
    	guides/source/ajax_on_rails.textile
    	guides/source/association_basics.textile
    	guides/source/upgrading_ruby_on_rails.md
    
    While resolving conflicts, I have chosen to ignore changes done in
    docrails at some places - these will be most likely 1.9 hash syntax
    changes.
Something went wrong with that request. Please try again.