Permalink
Commits on Aug 24, 2016
  1. @ProGM

    Merge branch '7.2.x' into 8.0.x

    * 7.2.x:
      Backporting #1258 to 7.0.x (travis speedup)
    ProGM committed Aug 24, 2016
  2. @ProGM

    Merge branch '7.1.x' into 7.2.x

    * 7.1.x:
      Backporting #1258 to 7.0.x (travis speedup)
    ProGM committed Aug 24, 2016
  3. @ProGM

    Merge branch '7.0.x' into 7.1.x

    * 7.0.x:
      Backporting #1258 to 7.0.x (travis speedup)
    ProGM committed Aug 24, 2016
  4. @ProGM

    Backporting #1258 to 7.0.x (travis speedup)

    ProGM committed Aug 24, 2016
  5. @ProGM

    Fix method duplication introduced by 9000c7d

    ProGM committed Aug 24, 2016
Commits on Aug 23, 2016
  1. @ProGM

    Merge branch '7.2.x' into 8.0.x

    * 7.2.x:
      Bump version 7.2.0
      CHANGELOG entry for #1271
      Another try...
      Trying to fix gemfile.
      Refactor `using_action_controller` to print output.
      Fix typo.
      ActiveRel improvements to make permitted_attributes work on it.
      Make changes work with rails 4.x
      Support for Unpermitted Attributes API.
    ProGM committed Aug 23, 2016
  2. @ProGM

    CHANGELOG entry for #1245.

    ProGM committed Aug 23, 2016
  3. @ProGM

    Bump version 7.2.0

    ProGM committed Aug 23, 2016
  4. @ProGM

    CHANGELOG entry for #1271

    ProGM committed Aug 23, 2016
  5. @ProGM

    Merge pull request #1271 from neo4jrb/fix-active-controller-params-7.1.x

    Backporting #1245 (Unpermitted parameters) to 7.2.x
    ProGM committed on GitHub Aug 23, 2016
  6. @ProGM

    Another try...

    ProGM committed Aug 23, 2016
  7. @ProGM

    Trying to fix gemfile.

    ProGM committed Aug 23, 2016
Commits on Aug 22, 2016
  1. @ProGM

    Refactor `using_action_controller` to print output.

    ProGM committed Aug 9, 2016
  2. @ProGM

    Fix typo.

    ProGM committed Jul 21, 2016
  3. @ProGM
  4. @ProGM

    Make changes work with rails 4.x

    ProGM committed Jul 20, 2016
  5. @ProGM
Commits on Aug 21, 2016
  1. @ProGM

    Merge branch '8.0.x'

    * 8.0.x:
      CHANGELOG entry for #1254
      Improvements based on #1264
      Destroy should return object like in ActiveRecord
      Use ActiveSupport::Logger instead of base Logger
      Release .15 patch with #1270 change
      Trying to fix ruby 2.0 build.
      Fix gemspec.
      Fix Gemfile for jruby.
      Accepting `nil` as enum value
      Add information about which exceptions are replacing old exceptions
      Update ActiveRel.rst
      Up to 7.1.2 to include fix from model_label_map_fix
      Put this back, because of course it broke things
      Fix issue with label / model mappings getting stuck before all models have a chance to load.  Also don't clear WRAPPED_CLASSES (I think this will fix the CypherNode issue we've been seeing in development
    ProGM committed Aug 21, 2016
  2. @ProGM

    Merge branch '7.1.x' into 8.0.x

    * 7.1.x:
      Release .15 patch with #1270 change
      Trying to fix ruby 2.0 build.
      Fix gemspec.
      Fix Gemfile for jruby.
      Accepting `nil` as enum value
      Update ActiveRel.rst
      Up to 7.1.2 to include fix from model_label_map_fix
      Put this back, because of course it broke things
      Fix issue with label / model mappings getting stuck before all models have a chance to load.  Also don't clear WRAPPED_CLASSES (I think this will fix the CypherNode issue we've been seeing in development
    ProGM committed Aug 21, 2016
  3. @ProGM

    Merge pull request #1245 from neo4jrb/fix-active-controller-params

    Support for Unpermitted Attributes API
    ProGM committed on GitHub Aug 21, 2016
  4. @cheerfulstoic

    CHANGELOG entry for #1254

    cheerfulstoic committed Aug 21, 2016
Commits on Aug 19, 2016
  1. @cheerfulstoic

    Improvements based on #1264

    cheerfulstoic committed Aug 19, 2016
  2. @cheerfulstoic

    Destroy should return object like in ActiveRecord

    cheerfulstoic committed Aug 19, 2016
  3. @cheerfulstoic
Commits on Aug 18, 2016
  1. @cheerfulstoic

    Merge branch '7.0.x' into 7.1.x

    Conflicts:
    	CHANGELOG.md
    	lib/neo4j/version.rb
    	neo4j.gemspec
    cheerfulstoic committed Aug 18, 2016
  2. @cheerfulstoic

    Release .15 patch with #1270 change

    cheerfulstoic committed Aug 18, 2016
  3. @ProGM

    Merge pull request #1270 from neo4jrb/fix-enum-default-value

    Accepting `nil` as enum value
    ProGM committed on GitHub Aug 18, 2016
  4. @ProGM

    Trying to fix ruby 2.0 build.

    ProGM committed Aug 18, 2016
Commits on Aug 16, 2016
  1. @ProGM

    Fix gemspec.

    ProGM committed Aug 16, 2016
  2. @ProGM

    Fix Gemfile for jruby.

    ProGM committed Aug 16, 2016
Commits on Aug 15, 2016
  1. @ProGM

    Accepting `nil` as enum value

    ProGM committed Aug 15, 2016
  2. @cheerfulstoic

    Add information about which exceptions are replacing old exceptions

    cheerfulstoic committed Aug 15, 2016
Commits on Aug 14, 2016
  1. @ProGM

    Fix overcommit installation on jruby 1.7

    ProGM committed Aug 14, 2016
  2. @ProGM

    Merge pull request #1256 from neo4jrb/improve-rails-generators

    Improve rails generators, added a migrator for 8.x.
    ProGM committed on GitHub Aug 14, 2016
Commits on Aug 12, 2016
  1. @cheerfulstoic

    Merge pull request #1265 from dalton/patch-1

    Update ActiveRel.rst
    cheerfulstoic committed on GitHub Aug 12, 2016