Mackenzie
2260f56713
Merge pull request #1056 from Br3nda/bw/contributors-case
...
Contributors check case-insentive
2016-11-12 18:39:18 -05:00
Brenda Wallace
eecd54c5ea
Use single quotes, as code climate suggests
2016-11-13 11:12:24 +13:00
Brenda Wallace
e1f0b649f5
if! -> unless, as code climate suggests
2016-11-13 11:10:45 +13:00
Brenda Wallace
9605ec6109
Pass args to system() to be escaped
2016-11-13 11:07:57 +13:00
Brenda Wallace
b2977d6806
Search contributors file, case insensitive.
2016-11-13 11:05:43 +13:00
Brenda Wallace
d091aecaf1
Use https for contributor link
...
Hoping this will fix the failing contributor error
2016-11-13 10:46:46 +13:00
Brenda Wallace
97f0d5fc5d
Add vendor to rubocop exclude path
2016-11-13 10:34:57 +13:00
Brenda Wallace
2bc9b8c8bb
Added rubocop check to travisci
2016-11-13 10:20:13 +13:00
Brenda Wallace
e312ee2773
All existing rubocop offfenses in a todo file
2016-11-13 10:20:00 +13:00
Brenda Wallace
c685b970d3
Add rubocop to bundle
...
So we can manage which version of rubocop to use.
2016-11-13 10:07:41 +13:00
Mackenzie Morgan
cee3d192e0
test the new order.by_member_id scope
2016-10-11 16:34:25 -04:00
Mackenzie Morgan
65bf4dae69
Merge branch 'dev' of gitmaco:Growstuff/growstuff into scopify
2016-10-11 15:42:18 -04:00
Mackenzie Morgan
494790bcd4
moving where clauses into scopes to keep that contained in models
2016-10-11 15:28:08 -04:00
Cesy
621b7e5d29
Merge pull request #1048 from pozorvlak/es_factorygirl_weirdness
...
Prevent FactoryGirl from trying to connect to ElasticSearch in tests
2016-10-11 08:58:32 +02:00
Cesy
b59ebb7d52
Merge pull request #984 from maco/rubocop_config
...
Rubocop config (ignore the red x)
2016-10-09 17:28:47 +01:00
Miles Gould
ce2141ddb7
Only initialise Crop.__elasticsearch__ if needed
...
The mere presence of this field was causing any test that ran
`FactoryGirl.create :alternate_name` to try to connect to an
ElasticSearch server, even if GROWSTUFF_ELASTICSEARCH was false.
Fixes #1047
2016-10-07 14:49:09 +01:00
Miles Gould
36c88c3762
Delete trailing whitespace
2016-10-07 14:48:38 +01:00
Mackenzie Morgan
099b399b24
bundle
2016-10-06 22:00:01 -04:00
Mackenzie Morgan
5092c78fba
merge
2016-10-06 21:48:18 -04:00
Cesy
199cdf20a7
Merge pull request #1045 from Br3nda/bw/harvest-link
...
harvest thumbnail title linking to the harvest itself
2016-09-25 10:21:59 +01:00
Brenda Wallace
7c1040e7aa
Corrected contributor name
2016-09-19 21:51:13 +12:00
Brenda Wallace
faf117b002
test for link to member's harvest
2016-09-19 18:02:44 +12:00
Brenda Wallace
13e491cda7
harvest thumbnail title linking to the harvest itself
2016-09-18 18:33:28 +12:00
Cesy
286b7118be
Merge pull request #1041 from CloCkWeRX/openfarm-links
...
Add links to OpenFarm
2016-09-15 11:31:13 +01:00
Cesy
b2dfe31b5c
Merge pull request #1043 from CloCkWeRX/fix_1042
...
Fix map token in prod configuration
2016-09-15 09:09:02 +01:00
Daniel O'Connor
1f005a3d42
Fixes #1042
2016-09-14 21:41:18 +09:30
Daniel O'Connor
36c64bd8dc
#1038 Add links to OpenFarm
2016-09-14 14:57:08 +09:30
Daniel O'Connor
277325d58c
Merge pull request #1036 from Br3nda/bw/json-sessions
...
allow registration and signin/out on the API
2016-09-14 14:50:04 +09:30
Brenda Wallace
370f407ad6
Adding Brenda Wallace to contributors
2016-09-13 19:25:22 +12:00
Daniel O'Connor
3ea8e2294e
Update README.md
...
Fixes #1037
2016-09-12 21:57:27 +09:30
Brenda Wallace
c6413afa67
allow registration and signin/out on the API
2016-09-11 14:23:50 +12:00
Cesy
fe137a11bb
Merge pull request #1031 from CloCkWeRX/queue_mail
...
Queue mail in sidekiq
2016-08-24 10:38:13 +01:00
Cesy
0fa15161d4
Merge pull request #811 from CloCkWeRX/add_facebook_signup
...
Add facebook signup
2016-08-24 10:37:47 +01:00
Daniel O'Connor
aeb8792165
Merge remote-tracking branch 'upstream/dev' into queue_mail
2016-08-24 06:35:51 +09:30
Daniel O'Connor
c60609d507
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-08-23 16:34:03 +09:30
Daniel O'Connor
ad04c07017
Merge pull request #1034 from cesy/railsupdate
...
Rails update
2016-08-23 01:03:46 +09:30
Daniel O'Connor
f3f8326360
Merge pull request #1033 from cesy/gemupdate
...
Updating a few gems
2016-08-23 01:00:36 +09:30
Cesy Avon
3798e386ae
Upgrading rails to 4.2.1
2016-08-22 14:14:58 +00:00
Cesy Avon
7d3afa005c
Updating a few gems
2016-08-22 14:00:03 +00:00
Daniel O'Connor
3bfe2329f1
Merge pull request #1032 from Growstuff/dev
...
Release 14
2016-08-22 19:19:04 +09:30
Daniel O'Connor
29765ebc19
rubocop --only HashSyntax --auto-correct
2016-08-22 19:02:27 +09:30
Daniel O'Connor
b91f0e7f63
Whitelist providers to avoid session data being tampered with
2016-08-22 18:59:28 +09:30
Daniel O'Connor
87352b04f1
Refactor to a method to DRY, even if its not 100% the best spot for it to live long term
2016-08-22 18:52:12 +09:30
Daniel O'Connor
0f034523e1
Only maximize if the driver supports such a thing
2016-08-22 18:26:08 +09:30
Daniel O'Connor
20b87e596a
Modern syntax
2016-08-22 18:25:57 +09:30
Daniel O'Connor
4b7cffad04
DEPRECATION WARNING: [Devise] bypass option is deprecated and it will be removed in future version of Devise.
2016-08-22 16:42:08 +09:30
Daniel O'Connor
bcb0a19dea
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-08-22 16:37:50 +09:30
Daniel O'Connor
4e2311e8d7
Indent
2016-08-22 16:36:30 +09:30
Daniel O'Connor
c7be0f3b0e
Fix redirects and sign the user in if they weren't yet created
2016-08-22 16:35:58 +09:30
Daniel O'Connor
9ab79209ef
Adjust TOS url
2016-08-22 16:35:41 +09:30
Mackenzie