Ryan Bates
|
4dcd544594
|
Merge pull request #765 from jonsgreen/issue/cancan_inserting_and_null_687
Issue #687: cancan inserting "AND (NULL)" at the end of sql
|
2012-10-25 14:25:46 -07:00 |
|
jonathangreenberg
|
f5b3fcd8db
|
Issue #687: cancan inserting "AND (NULL)" at the end of sql
Ensure that empty conditions does not trigger unmergeable conditions
|
2012-10-24 05:36:41 -04:00 |
|
Vasiliy Ermolovich
|
3b50fedd5d
|
Merge pull request #708 from calebthompson/patch-1
Refold generated Ability comments at 80 characters
|
2012-10-15 11:09:33 -07:00 |
|
Vasiliy Ermolovich
|
d4be93bc83
|
add contributing guide
[ci skip]
|
2012-10-13 21:01:46 +03:00 |
|
Vasiliy Ermolovich
|
9a84277549
|
show build status fro master branch
|
2012-10-13 20:57:48 +03:00 |
|
Caleb Thompson
|
857dd075c5
|
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.
|
2012-08-01 17:44:21 -03:00 |
|
Ryan Bates
|
b4285ae43c
|
Merge pull request #676 from brynary/master
Add Code Climate badge
|
2012-07-03 10:48:55 -07:00 |
|
Ryan Bates
|
2db73e60c6
|
Merge pull request #670 from andhapp/fix-issue-664
Namespaced Controllers not building new resource from params(regression 1.6.8)
|
2012-07-02 13:47:15 -07:00 |
|
Ryan Bates
|
cad4db2d7b
|
Merge pull request #660 from fl00r/master
Segmentation fault on aliasing
|
2012-07-02 13:36:44 -07:00 |
|
Ryan Bates
|
d20d90d2c2
|
Merge pull request #655 from DavidMikeSimon/master
Fix for issue #560
|
2012-07-02 13:27:21 -07:00 |
|
Bryan Helmkamp
|
8b993ee27d
|
Add Code Climate badge
|
2012-07-02 14:32:04 -03:00 |
|
Anuj Dutta
|
60bc9e98a7
|
Add code for fixing issue #664 (regression in 1.6.8).
|
2012-06-29 18:53:16 +01:00 |
|
Ryan Bates
|
1e89b31bad
|
releasing 1.6.8
|
2012-06-25 16:17:32 -07:00 |
|
fl00r
|
925274d29a
|
Fixing Segmentation fault on aliasing
|
2012-06-23 18:25:13 +04:00 |
|
David Mike Simon
|
b162871c6d
|
Spec to test against nested joins being thrown away ala issue 560
|
2012-06-19 16:58:15 -07:00 |
|
Ryan Bates
|
5f1be25419
|
preparing for 1.6.8
|
2012-06-19 12:56:51 -07:00 |
|
Ryan Bates
|
6d7bce78fc
|
updating changelog
|
2012-06-19 11:58:59 -07:00 |
|
Ryan Bates
|
a0200166cc
|
removing project status section from readme since contributors are now kind enough to keep tabs on the issue tracker
|
2012-06-19 11:37:45 -07:00 |
|
Ryan Bates
|
112a995327
|
clearing leftover whitespace
|
2012-06-19 11:36:59 -07:00 |
|
Ryan Bates
|
944804183e
|
load ostruct for OpenStruct used in spec
|
2012-06-19 11:35:58 -07:00 |
|
Ryan Bates
|
2b89dbbdfa
|
Merge pull request #653 from andhapp/fix-pull-request-640
Init attributes in InheritedResources controller w/ specs
|
2012-06-19 10:53:22 -07:00 |
|
Ryan Bates
|
aff8ca60e4
|
Merge pull request #650 from andhapp/fix-pull-request-486
Fixes Nested Resource Loading
|
2012-06-19 10:50:29 -07:00 |
|
Ryan Bates
|
33e33c584e
|
Merge pull request #618 from spatil/master
Check for defined ActionController::Base instead ActionController
|
2012-06-19 10:41:14 -07:00 |
|
David Mike Simon
|
cfc355c006
|
Fix for issue 560 where joins could be thrown away by ActiveRecordAdapter::merge_joins
|
2012-06-18 19:40:48 -07:00 |
|
Anuj Dutta
|
a1254ca1c6
|
Fix pull request 640. For some reason github didn't allow a clean merge althought there weren't any conflicts. Fix it so that it's easier to just merge via the UI.
|
2012-06-19 00:13:19 +01:00 |
|
Mike Pack
|
88aba4664a
|
Refactor out attribute assignment
|
2012-06-19 00:08:27 +01:00 |
|
Mike Pack
|
b965f5bab4
|
Add specs for resource attributes.
Remove inconsistent line breaks.
|
2012-06-19 00:08:27 +01:00 |
|
mccraig mccraig of the clan mccraig
|
c2c0b86c3a
|
initialise attributes after a resource is created by an InheritedResources controller
|
2012-06-19 00:08:26 +01:00 |
|
Mark Sim
|
d5baed6281
|
Fixes Nested Resource Loading
|
2012-06-18 06:52:32 +01:00 |
|
Ryan Bates
|
7bf683d8f4
|
Merge pull request #645 from andhapp/issue-644
Allow users to specify a mix of can and cannot rule for mongoid
|
2012-06-11 09:52:38 -07:00 |
|
Anuj Dutta
|
da663aaed1
|
Fix for issue-644 to allow users to specify a mix of can and cannot rules with mongo.
|
2012-06-10 22:54:45 +01:00 |
|
Ryan Bates
|
80a8c39a93
|
Merge pull request #632 from andhapp/fix-issue-327
Fix to handle MetaWhere and non-MetaWhere conditions correctly.
|
2012-05-29 10:04:18 -07:00 |
|
Ryan Bates
|
b3f9ffe93b
|
Merge pull request #625 from rogercampos/merging
Adding Ability#merge
|
2012-05-28 11:02:51 -07:00 |
|
Anuj Dutta
|
c27ead5b9f
|
Fix to handle MetaWhere and non-MetaWhere conditions correctly.
|
2012-05-26 18:00:50 +01:00 |
|
Ryan Bates
|
0c21831b4d
|
Merge pull request #619 from derekprior/namespace-fix
Updated: port fix for namespaced params from 2.0 back to 1.6
|
2012-05-14 09:24:25 -07:00 |
|
Chris Gunther
|
b347c7b78c
|
port fix for namespaced params from 2.0 back to 1.6
|
2012-05-14 10:52:29 -04:00 |
|
Ryan Bates
|
1cdd7b3c18
|
Merge pull request #509 from moffff/master
Fix 'spec/spec_helper.rb:20: uninitialized constant WithModel (NameError)'
|
2012-05-11 08:59:41 -07:00 |
|
Ryan Bates
|
7f4f469e58
|
Merge pull request #492 from soopa/master
Fix "uninitialized constant CanCan::Rule::ModelAdapters"
|
2012-05-11 08:51:50 -07:00 |
|
Gimi Liang
|
14e1f5cad4
|
Merge pull request #535 from manuelmeurer/patch-2
Fixed a small typo
|
2012-05-11 08:17:55 -07:00 |
|
Gimi Liang
|
8e46ccad8c
|
Merge pull request #616 from NickClark/rails_2_3_readme_clarification
Clarify readme for rails 2.3 users
|
2012-05-11 08:12:22 -07:00 |
|
Nicholas Clark
|
0bbe2e1802
|
Clarify readme for rails 2.3 users
|
2012-05-10 19:03:51 -04:00 |
|
Ryan Bates
|
10cbfbb923
|
adding a .rbenv-version file
|
2012-05-10 14:24:13 -07:00 |
|
Ryan Bates
|
a8a85f13a3
|
Merge pull request #541 from icrowley/master
Fixed bug with params for actions that build new instances with namespaced models
|
2012-05-10 13:51:45 -07:00 |
|
Ryan Bates
|
c1f7181336
|
Merge pull request #505 from nertzy/update_with_model
Use latest with_model gem
|
2012-05-10 11:45:27 -07:00 |
|
Ryan Bates
|
70515de8c1
|
Merge pull request #556 from mauriciozaffari/master
Pass forward :if and :unless options to the before filter.
|
2012-05-10 11:00:32 -07:00 |
|
Ryan Bates
|
b73bd062a8
|
Merge pull request #564 from flop/master
False positives on multiple nested abilities definitions
|
2012-05-10 10:59:08 -07:00 |
|
Ryan Bates
|
d1176245e6
|
Merge pull request #559 from plentz/patch-1
Adding travis-ci badge
|
2012-05-10 10:47:13 -07:00 |
|
Ryan Bates
|
78e1a17258
|
Merge pull request #587 from route/patch-1
Just add singleton to description of authorize_resource
|
2012-05-10 09:27:03 -07:00 |
|
Ryan Bates
|
6e8bc851be
|
Merge pull request #607 from Mixbook/master
Added support for value to be Enumerable
|
2012-05-10 09:25:59 -07:00 |
|
Aryk Grosz
|
65bbf0e354
|
Add check for Enumerable as condition value
|
2012-04-23 00:51:55 -07:00 |
|