Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: ryanb/cancan
base: 1.3.3
...
head fork: ryanb/cancan
compare: 1.6.9
This comparison is big! We're only showing the most recent 250 commits
Commits on Sep 03, 2010
Ryan Bates the new and create actions will now build the resource with attribute…
…s based on ability conditions hash - closes #114
a744377
Ryan Bates cleaning up some internal specs and names 721939b
Ryan Bates have params hash override initial attributes when building a new reso…
…urce
7c52433
Ryan Bates adding check_authorization and skip_authorization controller class me…
…thods to ensure authorization is triggered (thanks justinko) - closes #135
1af6c6f
Ryan Bates filling in some inline documentation for 1.4 bf9b8ad
Commits on Sep 07, 2010
Ryan Bates adding action and subject variables to I18n unauthorized message - cl…
…oses #142
158c908
Ryan Bates load the collection instance variable on index action - closes #137 9d91545
Commits on Sep 08, 2010
Ryan Bates fix pluralize error on index action when passing resource name - closes
#143 again
a5ff826
Commits on Sep 09, 2010
Ryan Bates adding support for loading through Inherited Resources - closes #23 4eee637
Commits on Sep 16, 2010
Juan Manuel Barreneche jbarreneche Controllers which use 'inherit_resources' instead of Inheritance may …
…have inherited_resource's methods protected
961df90
Juan Manuel Barreneche jbarreneche Use cancan_resource_class for before filters instead of hardcoded Con…
…trollerResource class
0b270f2
Sokolov Yura funny-falcon resolve issue 149 f236b1b
Sokolov Yura funny-falcon allow to check ability by common module e2c341b
Sokolov Yura funny-falcon fix error a0f73fe
Sokolov Yura funny-falcon add specs for module definitions ff9a917
Sokolov Yura funny-falcon add specs to sql conditions by not Hash 7e0e722
Ryan Bates fetch cancan_resource_class through controller class from ControllerR…
…esource
cef55c9
Commits on Sep 20, 2010
Sokolov Yura funny-falcon consistency addition for ability check on Module ebef3cc
Commits on Sep 21, 2010
Ryan Bates raise AccessDenied error when loading child while parent is nil, pass…
… :shallow => true to bypass
264e2d2
Ryan Bates support loading resource :through method along with instance variable…
… - closes #146
c11ffb6
Ryan Bates adding to changelog 3391c5a
Commits on Sep 23, 2010
Ryan Bates use 'send' to access controller current_ability in case it's private 1f81b8d
Commits on Oct 04, 2010
Sokolov Yura funny-falcon should not allow to can? when raw sql without block is present 12037d7
Ryan Bates don't stop at cannot definitions when there are no conditions - closes 8f49f28
Commits on Oct 05, 2010
Ryan Bates adding Gemfile, to get specs running just bundle and rake - closes #163 18b45d5
Ryan Bates adding a couple things to the changelog b0cec52
Ryan Bates looks like Bundler automatically requires cancan for the specs fa766e7
Ryan Bates updating readme and documentation 6c3e87e
Ryan Bates releasing version 1.4.0 67cd83d
Commits on Oct 08, 2010
Ryan Bates using supermodel in specs to remove some of the model stubs f901c36
Commits on Oct 13, 2010
Mani Tadayon bowsersenior Add support for Mongoid documents along with basic specs. be74df0
Mani Tadayon bowsersenior Add support for Mongoid::Criteria Symbol extensions (:age.gt => 10) a…
…long with specs.
ab82dcb
Commits on Oct 14, 2010
Mani Tadayon bowsersenior Fix accessible_by for Mongoid documents when no ability is defined.
The previous spec that checked for this was not right, since there were no documents in the collection, so every query would return an empty result.
25bf479
Commits on Oct 15, 2010
Mani Tadayon bowsersenior Fix bug with CanDefinition#tableized_conditions being used with Mongo…
…id documents and add more specs for accesible_by with Mongoid.
d256aeb
Mani Tadayon bowsersenior Fix bug with Mongoid document where :manage :all caused accessible_by…
… to return nothing and add specs to test for :manage :all.
dbcd93e
Commits on Nov 12, 2010
Michael Halliday mphalliday This fixes an odd error I was seeing in development mode when cache_c…
…lasses = false (the default), specifically when loading an object throught the parent in load_and_authorize_resource.

Assume Photo model and User model where user has many photos:

@photo = current_user.photos.find(1) # this returns a photo
@photo1 = Photo.find(1)

@photo.kind_of?(Photo) is not always true for some reason when class_cacheing is false.  Where as @photo1.kind_of?(Photo) always appears to be true.  Of interesting note, in the above example @photo != @photo1 if kind_of? is false.  Very odd.
 
Again, this only appears to be when loading and object through an association.
79180de
Ramon Tayag ramontayag checks if active record responds to 'joins', so this can work with in…
…ternuity's quick_scopes gem; added .swp files to git ignore
cf263c1
Nanda Lopes nandalopes Fix NoMethodError
Raises NoMethodError when using ":singleton => true, :shallow => true" and parent_resource is nil
9a7c427
Ryan Bates fixing specs due to joins method check in active record additions ebf77ed
Ryan Bates adding :through_association option to load_resource (thanks hunterae)…
… - closes #171
92995d7
Ryan Bates renaming skip_authorization to skip_authorization_check - closes #169 787511a
Ryan Bates releasing version 1.4.1 872e4cf
Commits on Nov 16, 2010
tylergannon tylergannon can? should only go to db if there are mongoid criteria in the condit…
…ions.

Easier to just do a simple comparison on the object in memory
than to search the database.  Also this allows method calls
and other attributes that might not be found in the database.
f6aaa58
Mani Tadayon bowsersenior Update specs for MongoidAdditions to use rr mocks 5ebca1f
Commits on Nov 17, 2010
Mani Tadayon bowsersenior Add comments clarifying `alias_method` in MongoidAdditions 84c590e
Mani Tadayon bowsersenior Remove commented-out line from gemspec 2ee6908
Commits on Dec 21, 2010
Ryan Bates Merge branch 'master' of https://github.com/bowsersenior/cancan into …
…bowsersenior-master
a6959c0
Ryan Bates renaming CanDefinition to Rule 37c1491
Ryan Bates adding ability generator - closes #170 9b8e849
Ryan Bates allow query.conditions to be called multiple times without losing con…
…ditions
5e1e6e1
Ryan Bates improve support for rspec scaffolding (thanks voxik) - closes #176 4339ac6
Commits on Dec 26, 2010
Mani Tadayon bowsersenior Rename Mongoid collection used in spec and fix description for first …
…spec
ebb8e1b
Mani Tadayon bowsersenior Fix bug with MongoidAdditions throwing a NameError when Mongoid is no…
…t defined by always checking if Mongoid is defined before referencing Mongoid-related constants

Also add spec for this bug
e14e1ed
Commits on Dec 28, 2010
Ryan Bates switching gemspec version to 1.5.0.beta1 to avoid confusion 2d31cbd
Commits on Dec 29, 2010
Nate Mueller natemueller Add support and tests for datamapper.
This broke some of the mongoid tests and I don't know how to fix them.  Both packages
  define Symbol#in, and when you load them both things don't behave properly.  Hopefully
  someone more versed in mongoid can rewrite the spec to not depend on the Symbol extensions.
d315e22
Ryan Bates adding .rvmrc file to switch to Ruby 1.8.7 for development 5183113
Ryan Bates moving model adapter specs into their own directory with MODEL_ADAPTE…
…R environment variable for choosing which one to run
f9a498d
Ryan Bates move mongoid/dm gems into Gemfile and load dynamically based on MODEL…
…_ADAPTER env variable
2dc2a57
Ryan Bates adding some documentation for running specs with different model adap…
…ters
f8760b7
Ryan Bates adding model adapter files in proper location with loading behavior 4c5ba09
Commits on Dec 30, 2010
Ryan Bates adding initial active record adapter af9e77a
Ryan Bates fixing active record adapter behavior and improving specs for it cc30e83
Ryan Bates dynamically detect which model adapter to use given a class bbb02f7
Ryan Bates cleanup whitespace 8628aa0
Ryan Bates removing fake sanitize methods in specs because we're using Active Re…
…cord now
e8d298c
Ryan Bates switching data mapper to new adapter f5dce44
Ryan Bates switching mongoid over to new adapter f7a494d
Ryan Bates moving accessible_by out into ModelAdditions module ec616ae
Ryan Bates removing Mongoid::Components hack, tests are passing without it, add …
…tests if this is actually needed
fc867c9
Ryan Bates removing query.rb since it is no longer used f9f71d6
Ryan Bates adding spec_all task for running specs for all model adapters 70b5f9a
Ryan Bates adding spec_all rake task to spec readme 6ccb4dd
Commits on Jan 03, 2011
Mani Tadayon bowsersenior Automatically add `accessible_by` to Mongoid Documents to match CanCa…
…n behavior for ActiveRecord and DataMapper.

Previously, CanCan::ModelAdditions had to be included in each and every Mongoid document separately. Also removed manual include of CanCan::ModelAdditions from Mongoid documents in Mongoid adapter specs.
f759ab7
Commits on Jan 04, 2011
Ryan Bates removing unused sanitization code in mongoid spec bd9480c
Ryan Bates moving with_model rspec configuration into Active Record model adapte…
…r spec
685e926
Ryan Bates allow model adapter to override condition hash matching in Rule, also…
… clean up Mongoid adapter and specs
cef6c21
Commits on Jan 05, 2011
Ryan Bates improving DataMapper adapter and specs 15ca8ad
Ryan Bates don't authorize uncountable instance in collection action - closes #193 bc9ecb2
Commits on Jan 06, 2011
Mani Tadayon bowsersenior Use `Mongoid::Matchers#matches?` instead of a database query in `Mong…
…oidAdapter#matches_conditions_hash?`
12b0bff
Mani Tadayon bowsersenior Add MongoidAdapter specs for unsaved instances 9a14c70
Commits on Jan 07, 2011
Ryan Bates use gemset in rvmrc (thanks bowsersenior) - closes #231 045a850
Ryan Bates Merge branch 'bowsersenior-master' 71ceb83
Commits on Jan 08, 2011
Ryan Bates adding skip load and authorize behavior - closes #164 5732711
Ryan Bates moving parts of the README into wiki pages e2910a7
Ryan Bates updating changelog 3885f46
Ryan Bates fixing github links in readme 39bffe9
Commits on Jan 09, 2011
Ryan Bates fixing link in readme e49190f
Commits on Jan 11, 2011
Ryan Bates updating readme for 1.5 120eafe
Ryan Bates releasing 1.5.0 04522c9
Commits on Jan 18, 2011
Ryan Bates changing flash[:error] to flash[:alert] in rdocs - closes #238 52b3358
Scott Ellard stellard updated mongoid 344832d
Scott Ellard stellard added cannot support and multiple can support 55c8a50
Ryan Bates readme improvements 2012311
Scott Ellard stellard improved test assertion cff9229
Commits on Jan 19, 2011
Ryan Bates Merge branch 'master' of https://github.com/stellard/cancan into stel…
…lard-master
78cbea5
Ryan Bates cleaning up mongoid adapter a little 5c4c179
Commits on Jan 20, 2011
Ryan Bates handle deeply nested conditions properly in active record adapter - c…
…loses #246
f9ad485
Ryan Bates releasing 1.5.1 929579f
Commits on Jan 28, 2011
Ryan Bates moving :alert into redirect_to call in documentation b2028c8
Commits on Feb 03, 2011
Adam Wróbel amw Pass action name to accessible_by. f1ea21b
Commits on Feb 04, 2011
Sam Pohlenz spohlenz Fix rule check on Hash-like subjects f23bbe0
Commits on Feb 14, 2011
Ryan Bates Merge branch 'pass_action_to_accessible_by' of https://github.com/amw…
…/cancan into amw-pass_action_to_accessible_by
471d54c
Ryan Bates fixing tests for passing action name through to accessible_by call 3901cbe
Commits on Feb 17, 2011
Stefano Verna stefanoverna Fix for deeply nested resources when using inherited resources 8722fbc
Commits on Feb 22, 2011
Ryan Bates adding Lock It Down section to readme 79995e4
Commits on Mar 08, 2011
Trond Arve Nordheim tanordheim Use collection instead of end_of_association_chain in the inherited_r…
…esources integration, as per suggested by aq1018
e3eab13
Ryan Bates fixing association conditions when MetaWhere is installed (thanks acm…
…etech) - closes #261
52435e9
Ryan Bates adding initial MetaWhere support ff5aaf5
Ryan Bates making it easier to test all MetaWhere conditions 07088a0
Ryan Bates raise a NotImplemented exception if it's an unrecognized MetaWhere co…
…ndition
c53ed1e
Ryan Bates simplifying .rvmrc bcf2756
Ryan Bates Merge branch 'inherited_resources_collection_fix' of https://github.c…
…om/tanordheim/cancan into tanordheim-inherited_resources_collection_fix
28a9a0a
Ryan Bates Merge branch 'master' of https://github.com/stefanoverna/cancan into …
…stefanoverna-master
2c2fa30
Ryan Bates fixing spec for Inherited Resource parent loading 3a07d62
Ryan Bates adding :prepend option to load_and_authorize_resource - closes #290 951d70e
Ryan Bates add space in multiword model in I18n unauthorized message - closes #292 ba99997
Commits on Mar 09, 2011
Ryan Bates load collection resources in custom controller actions with no id par…
…am - closes #296
37102fe
Ryan Bates adding :if and :unless options to check_authorization - closes #284 80f1ab2
Ryan Bates allow Active Record scope to be passed as Ability conditions - closes #… f9b181a
Ryan Bates raise an error when trying to make a rule with both hash conditions a…
…nd a block - closes #269
0de43c4
Ryan Bates Merge branch 'master' into meta_where a492691
Ryan Bates adding more MetaWhere comparison operators eb2826f
Ryan Bates adding any/all support for MetaWhere conditions 9bee4a8
Commits on Mar 11, 2011
Ryan Bates releasing 1.6.0 efa3ff1
Commits on Mar 16, 2011
Adam Wróbel amw Fixes inherited_resources collection authorization
This reverts e3eab13

I don't know what was the idea of that, but it turned out REAL bad.

`collection` sets the collection instance variable. `resource_base` is used all
over CanCan. It's also used inside `load_collection?` which is checked before
`load_collection` is called. That means we actually set the collection instance
variable through inherited_resources (without any authorization whatsoever) before trying to load it through CanCan using `accessible_by`.

    1. def load_resource
    2.  unless skip?(:load)
    3.    if load_instance?
    4.      self.resource_instance ||= load_resource_instance
    5.    elsif load_collection?
    6.      self.collection_instance ||= load_collection
    7.    end
    8.  end
    9. end

`collection_instance` is set on line 5 instead of line 6.
3639ca9
Ryan Bates making accessible_by action default to :index and parent action defau…
…lt to :show so we don't check :read action directly - closes #302
fdd5ad0
Ryan Bates use Item.new instead of build_item for singleton resource so it doesn…
…'t mess up database - closes #304
3f6cecb
Ryan Bates releasing 1.6.1 b0c1646
Commits on Mar 18, 2011
Ryan Bates fixing failing MetaWhere spec 3efa069
Ryan Bates fixing instance loading with :singleton option - closes #310 7688025
Ryan Bates releasing 1.6.2 5d97cfb
Commits on Mar 25, 2011
Ryan Bates return subject passed to authorize! - closes #314 1ac8099
Ryan Bates make sure ActiveRecord::Relation is defined before checking condition…
…s against it so Rails 2 is supported again - closes #312
89e4098
Ryan Bates releasing 1.6.3 fb8e9bd
Commits on Mar 30, 2011
Ryan Bates fixing mongoid 'or' error - closes #322 e96cf5b
Ryan Bates releasing 1.6.4 7bcfd3d
Commits on Apr 01, 2011
Florent Piteau flop Failling test for nested resources with a scope for conditions 81f00f9
Florent Piteau flop When using an existing scope, it should be merged properly to the cla…
…ss. May fix ryanb/cancan#328 :)
a10243a
Mitch Williams thatothermitch Fixed bug where conditions on an optionally associated object would t…
…hrow exceptions if the associated object was not present at the rule match time.
6aaab9e
Ryan Bates Merge branch 'optional-associations' of https://github.com/socialcast…
…/cancan into socialcast-optional-associations
b1424df
Commits on Apr 15, 2011
Ryan Ahearn rahearn Adds ability to use Scope query with Mongoid
Same limitations apply as with active record
* can not be OR'd with other rules for same ability/controller
2b62041
Commits on Apr 25, 2011
Ryan Bates Merged pull request #343 from rahearn/mongoid-scope.
Adds ability to use Scope query with Mongoid
18c1007
Commits on Apr 27, 2011
John Feminella Augments Mongoid adapter by handling case where attribute is an array 17c52a7
Ryan Bates Merged pull request #352 from cardagin/topic/mongoid-adapter-enhancem…
…ents.

Augments Mongoid adapter by handling case where attribute is an array
a6af47d
Commits on Apr 29, 2011
Emmanuel Gomez emmanuel Use dkubb's suggestion for evaluating conditions against a Resource. 6d39b0a
Emmanuel Gomez emmanuel Fix pending spec for DataMapper adapter. d6851de
Emmanuel Gomez emmanuel Return empty set early if no can rules are present.
Thanks dkubb!
16bdb8d
Commits on May 02, 2011
Ryan Bates Merge pull request #355 from emmanuel/issue/245.
DataMapper adapter improvements
ff13a82
Commits on May 10, 2011
Ryan Ahearn rahearn Fixes bug in mongoid_adapter with empty conditions hash
* adds mongoid query that matches every record when
rule.conditions.empty? is true
ad62d60
Commits on May 12, 2011
Ryan Ahearn rahearn Processes can rules only if no empty conditions rules are present
1) remove all empty conditions hashes from the rules, they are included
 in the records through `@model_class.all`
2) only process can rules if the new and old rules lists are the same
  length (meaning there were no empty conditions hashes)
3) always process cannot rules
0882450
Commits on May 17, 2011
Ryan Bates ensure Mongoid::Document is defined before loading Mongoid adapter - …
…closes #359
cb9777b
Ryan Bates allow :through option to work with private controller methods - closes dde88c9
Ryan Bates adding current_ability to helper methods - closes #361 4e4c5a9
Ryan Bates Merge pull request #363 from rahearn/mongoid-conditions-empty
Fixes bug in mongoid_adapter with empty conditions hash
74c9d58
Commits on May 18, 2011
Ryan Bates pass action and subject through AccessDenied exception when :through …
…isn't found - closes #366
843fe89
Ryan Bates releasing 1.6.5 6a01427
Commits on May 20, 2011
Ryan Bates allow :find_by option to be full find method name - closes #335 c031f82
Commits on May 21, 2011
Ryan Bates delegating ControllerResource find to model adapter, uses 'get' for D…
…ataMapper - closes #373
613ab1c
Commits on Jun 30, 2011
Nicolás Hock-Isaza nhocki Make CanCan Default Message a translatable text. Default to the one y…
…ou had.
596ad23
Nicolás Hock-Isaza nhocki Adding tests for i18n translation for default messages 71f60bc
Commits on Jul 01, 2011
Nicolás Hock-Isaza nhocki Change the i18n default name to :"unauthorized.default" 1c3e617
Ryan Bates Merge pull request #409 from nhocki/patch-1
Make CanCan Default Message a translatable text.
8f815c4
Peter Sanford psanford Load datamapper class methods via append_extensions.
This relaxes the previous requirement that cancan has to be loaded
before any models are. append_extensions will apply to all
previously loaded models as well as ones loaded after.
ccd7a94
Ryan Bates Merge pull request #410 from psanford/improve_datamapper_loading
Load datamapper class methods via append_extensions.
600a3e1
Commits on Jul 19, 2011
Michael MacDonald schlick Compatibility fix for using cancan with rspec-instafail and rspec1 3b33b36
Commits on Jul 20, 2011
Steven Anderson Added support for engines and namespaced models. 6c497b8
Steven Anderson Added the needed camelize to recent patch for engines and namespaced …
…models
d35419f
Geoff Parsons skhisma :id_param option to load_resource allows specification of the param n…
…ame to find members
7937a28
Commits on Jul 21, 2011
beawesomeinstead The first try to make cancan pass on Travis CI 1ab4e2d
Manuel Meurer manuelmeurer Fixed typos. e561532
beawesomeinstead Run rake instead of rake test d24ef45
beawesomeinstead These lines are defaults, should be fine this way 0fc67e4
Commits on Jul 23, 2011
Ryan Bates Merge pull request #426 from manuelmeurer/patch-1
Fixed documentation for skip_load_resource and skip_authorize_resource.
e0492f5
Ryan Bates Merge pull request #421 from amc-projects/master
Compatibility fix for rspec-instafail and rspec1
987dce0
Commits on Jul 24, 2011
Ryan Bates Merge pull request #427 from bai/master
Add .travis.yml for building cancan on a lovely Travis CI service
0343f8f
Ryan Bates removing 1.9.2 from .travis.yml 2be3f98
Ryan Bates updating Rails gem dev dependency 916f97f
Commits on Sep 21, 2011
Carlos Kirkconnell kirkconnell use version 1.x of with_model to avoid errors in class comparisons 5ab7dea
Commits on Sep 28, 2011
Ryan Bates Merge pull request #476 from kirkconnell/with_model-version-fix
Specs fail when running in a freshly installed environment.
0edd310
Ryan Bates Merge pull request #424 from whilefalse/master
Support for namespaced models and engines
cfb801e
Ryan Bates Merge pull request #425 from skhisma/master
Allow custom IDs to be specified when calling load_resource
610d7e3
Patrick Morgan codeprimate Correct "return cant jump across threads" error when using check_auth…
…orization()
b3fc5ad
Ryan Bates removing jruby/rubinius from travis.yml for now until I figure out wh…
…y they aren't passing
9832639
Commits on Sep 29, 2011
Ryan Bates releasing version 1.6.6 26b40f2
Commits on Oct 04, 2011
Ryan Bates quick fix to get nested resources working again - closes #482 67a3038
Ryan Bates releasing 1.6.7 with nested resource fix 9eebeb2
Commits on Oct 15, 2011
Adam Michela soopa fix uninitialized constant warning in CanCan::Rule#model_adapter 80ceaf8
Commits on Oct 31, 2011
Roger Campos rogercampos Adding Ability#merge 7797b37
Commits on Nov 03, 2011
Grant Hutchins nertzy Use latest with_model gem
Now with_model clears the association class cache
between specs, which fixes a test pollution
problem.
9831294
Commits on Nov 09, 2011
Moff moffff Fixed problem with 'with_model' gem in DataMapper tests and Mongoid t…
…ests.
f18f53c
Commits on Dec 25, 2011
Manuel Meurer manuelmeurer Fixed typo e65f9bd
Commits on Jan 05, 2012
Dmitry Afanasyev icrowley Fixed bug with params for actions that build new instances with names…
…paced models
baadcb9
Commits on Feb 02, 2012
Mauricio Zaffari mauriciozaffari Pass forward :if and :unless options to the before filter. i.e:
    load_and_authorize_resource :if => condition == true
83e2dce
Commits on Feb 15, 2012
Diego Plentz plentz adding travis-ci badge 37a42e3
Commits on Feb 29, 2012
Florent Piteau flop Don't remove key-value from the subject hash we might want to use it …
…again.
ba01349
Commits on Mar 22, 2012
Dmitry Vorotilin route Just add singleton to description of authorize_resource f166b59
Commits on Apr 03, 2012
Shailesh spatil checked for ActionContoller::Base instead of just ActionContoller 51702e0
Commits on Apr 17, 2012
Ryan Bates adding project status message to readme aed37cd
Commits on Apr 23, 2012
Aryk Grosz Aryk Add check for Enumerable as condition value 65bbf0e
Commits on May 10, 2012
Ryan Bates Merge pull request #607 from Mixbook/master
Added support for value to be Enumerable
6e8bc85
Ryan Bates Merge pull request #587 from route/patch-1
Just add singleton to description of authorize_resource
78e1a17
Ryan Bates Merge pull request #559 from plentz/patch-1
Adding travis-ci badge
d117624
Ryan Bates Merge pull request #564 from flop/master
False positives on multiple nested abilities definitions
b73bd06
Ryan Bates Merge pull request #556 from mauriciozaffari/master
Pass forward :if and :unless options to the before filter.
70515de
Ryan Bates Merge pull request #505 from nertzy/update_with_model
Use latest with_model gem
c1f7181
Ryan Bates Merge pull request #541 from icrowley/master
Fixed bug with params for actions that build new instances with namespaced models
a8a85f1
Ryan Bates adding a .rbenv-version file 10cbfbb
Nicholas Clark NickClark Clarify readme for rails 2.3 users 0bbe2e1
Commits on May 11, 2012
Gimi Liang Gimi Merge pull request #616 from NickClark/rails_2_3_readme_clarification
Clarify readme for rails 2.3 users
8e46cca
Gimi Liang Gimi Merge pull request #535 from manuelmeurer/patch-2
Fixed a small typo
14e1f5c
Ryan Bates Merge pull request #492 from soopa/master
Fix "uninitialized constant CanCan::Rule::ModelAdapters"
7f4f469
Ryan Bates Merge pull request #509 from moffff/master
Fix 'spec/spec_helper.rb:20: uninitialized constant WithModel (NameError)'
1cdd7b3
Commits on May 14, 2012
Chris Gunther cgunther port fix for namespaced params from 2.0 back to 1.6 b347c7b
Ryan Bates Merge pull request #619 from derekprior/namespace-fix
Updated: port fix for namespaced params from 2.0 back to 1.6
0c21831
Commits on May 26, 2012
Anuj Dutta andhapp Fix to handle MetaWhere and non-MetaWhere conditions correctly. c27ead5
Commits on May 28, 2012
Ryan Bates Merge pull request #625 from rogercampos/merging
Adding Ability#merge
b3f9ffe
Commits on May 29, 2012
Ryan Bates Merge pull request #632 from andhapp/fix-issue-327
Fix to handle MetaWhere and non-MetaWhere conditions correctly.
80a8c39
Commits on Jun 10, 2012
Anuj Dutta andhapp Fix for issue-644 to allow users to specify a mix of can and cannot r…
…ules with mongo.
da663aa
Commits on Jun 11, 2012
Ryan Bates Merge pull request #645 from andhapp/issue-644
Allow users to specify a mix of can and cannot rule for mongoid
7bf683d
Commits on Jun 18, 2012
Mark Sim marksim Fixes Nested Resource Loading d5baed6
mccraigmccraig of the clan mccraig mccraigmccraig initialise attributes after a resource is created by an InheritedReso…
…urces controller
c2c0b86
Mike Pack mikepack Add specs for resource attributes.
Remove inconsistent line breaks.
b965f5b
Mike Pack mikepack Refactor out attribute assignment 88aba46
Anuj Dutta andhapp Fix pull request 640. For some reason github didn't allow a clean mer…
…ge althought there weren't any conflicts. Fix it so that it's easier to just merge via the UI.
a1254ca
Commits on Jun 19, 2012
David Simon DavidMikeSimon Fix for issue 560 where joins could be thrown away by ActiveRecordAda…
…pter::merge_joins
cfc355c
Ryan Bates Merge pull request #618 from spatil/master
Check for defined ActionController::Base instead ActionController
33e33c5
Ryan Bates Merge pull request #650 from andhapp/fix-pull-request-486
Fixes Nested Resource Loading
aff8ca6
Ryan Bates Merge pull request #653 from andhapp/fix-pull-request-640
Init attributes in InheritedResources controller w/ specs
2b89dbb
Ryan Bates load ostruct for OpenStruct used in spec 9448041
Ryan Bates clearing leftover whitespace 112a995
Ryan Bates removing project status section from readme since contributors are no…
…w kind enough to keep tabs on the issue tracker
a020016
Ryan Bates updating changelog 6d7bce7
Ryan Bates preparing for 1.6.8 5f1be25
David Simon DavidMikeSimon Spec to test against nested joins being thrown away ala issue 560 b162871
Commits on Jun 23, 2012
Peter Yanovich fl00r Fixing Segmentation fault on aliasing 925274d
Commits on Jun 25, 2012
Ryan Bates releasing 1.6.8 1e89b31
Commits on Jun 29, 2012
Anuj Dutta andhapp Add code for fixing issue #664 (regression in 1.6.8). 60bc9e9
Commits on Jul 02, 2012
Bryan Helmkamp brynary Add Code Climate badge 8b993ee
Ryan Bates Merge pull request #655 from DavidMikeSimon/master
Fix for issue #560
d20d90d
Ryan Bates Merge pull request #660 from fl00r/master
Segmentation fault on aliasing
cad4db2
Ryan Bates Merge pull request #670 from andhapp/fix-issue-664
Namespaced Controllers not building new resource from params(regression 1.6.8)
2db73e6
Commits on Jul 03, 2012
Ryan Bates Merge pull request #676 from brynary/master
Add Code Climate badge
b4285ae
Commits on Aug 01, 2012
Caleb Thompson calebthompson Refold generated Ability comments at 80 characters
A lot of people still fold their code at 80 characters, so it is
nice to have generated code consider this.
857dd07
Commits on Oct 13, 2012
Vasiliy Ermolovich nashby show build status fro master branch 9a84277
Vasiliy Ermolovich nashby add contributing guide
[ci skip]
d4be93b
Commits on Oct 15, 2012
Vasiliy Ermolovich nashby Merge pull request #708 from calebthompson/patch-1
Refold generated Ability comments at 80 characters
3b50fed
Commits on Oct 24, 2012
Jonathan jonsgreen Issue #687: cancan inserting "AND (NULL)" at the end of sql
Ensure that empty conditions does not trigger unmergeable conditions
f5b3fcd
Commits on Oct 25, 2012
Ryan Bates Merge pull request #765 from jonsgreen/issue/cancan_inserting_and_nul…
…l_687

Issue #687: cancan inserting "AND (NULL)" at the end of sql
4dcd544
Commits on Dec 12, 2012
Ryan Bates add gem version badge (thanks Gemfury) 3f4ee12
Commits on Feb 04, 2013
Ryan Bates releasing 1.6.9 38d4654