Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Spree Upgrade] Merging master into 2-0-stable (one month of commits in master) #2863

Merged
merged 246 commits into from
Oct 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
246 commits
Select commit Hold shift + click to select a range
28792fc
Add tests for adding/updating enterprise images
kristinalim Jul 26, 2018
1df1ddc
Add spec for saving product and variant simultaneously
Matt-Yorkley Aug 27, 2018
8c2a49a
Update PI model spec
Matt-Yorkley Aug 27, 2018
6b9b8d8
Match multiple product names
Matt-Yorkley Aug 28, 2018
f905284
Add spec for edge case
Matt-Yorkley Aug 28, 2018
8de0355
Add spec for multiple stages during import
Matt-Yorkley Aug 28, 2018
1de13a5
Favor #public_send over #send using Rubocop's cop
sauloperez Aug 30, 2018
f5c44ef
Rename "entreprise" in i18n keys to "enterprise"
kristinalim Aug 31, 2018
04d50d4
Fix filter results bug in validation section
Matt-Yorkley Aug 31, 2018
75a9ea5
Prefer .flat_map(&foo) over .map(&foo).flatten
Matt-Yorkley Aug 31, 2018
4557bfb
[Security] Bump rubyzip from 1.2.1 to 1.2.2
dependabot-support Aug 31, 2018
4dfbbd6
Fix occasional StaleObjectError on variant updates
Matt-Yorkley Aug 31, 2018
d8bbcdc
Decrease batch size to reduce chance of timeouts
Matt-Yorkley Aug 31, 2018
9d05e5c
Remove duplicate line in spec
Matt-Yorkley Sep 1, 2018
e62a755
Adds comments for setting up timezone in application.yml
apoc64 Sep 2, 2018
f74a6e4
Remove css_splitter references, delete all_split2.css. #1361 #2633
Vadlusk Sep 2, 2018
14d526e
removed assets related to spree store: dead code
luisramos0 Aug 11, 2018
fbce828
Breaks comment into multiple lines
apoc64 Sep 3, 2018
8efbe0e
Delete _split2.css from application.rb assets precompile array.
Vadlusk Sep 3, 2018
f30032e
Include image URLs in serialized enterprise for admin
kristinalim Jul 29, 2018
01d4b8f
Allow custom resource permission for admin controllers
kristinalim Aug 25, 2018
9c3bb86
Add endpoints for removing enterprise images
kristinalim Jul 12, 2018
c937067
Add JS support for removal of enterprise images
kristinalim Jul 28, 2018
368612c
Allow removal of enterprise logo and promo image
kristinalim Jul 29, 2018
ce0758d
Add confirm dialog for enterprise image removal
kristinalim Jul 30, 2018
b23cb55
Fix current violations of Style/Send cop
sauloperez Aug 31, 2018
0a05e69
Merge pull request #2625 from kristinalim/translations-rename_entrepr…
sauloperez Sep 5, 2018
138fa41
Fetched latest translations from transifex with tx pull --force
luisramos0 Sep 4, 2018
6e55e5b
Use maximum of 80% for modals in large screens
kristinalim Aug 14, 2018
34adf7c
Lower the start point for sliding of modals
kristinalim Aug 14, 2018
a37e9f1
Use v0.9.0-20180826174721 in kristinalim fork of angular-foundation
kristinalim Aug 15, 2018
f03eb02
Keep height of modal, dialog within screen height
kristinalim Aug 15, 2018
f472519
Move some CSS to pages/ subdirectory.
kristinalim Aug 19, 2018
169aa75
Enlarge potential size of modals for large screens
kristinalim Aug 26, 2018
9258e8c
Remove height limit for modals in small screens
kristinalim Aug 26, 2018
339ea6f
Clean up SCSS as suggested by scss-lint
kristinalim Aug 26, 2018
28d2bb3
Wrap controller specs for viewing cart
kristinalim Sep 1, 2018
3bf9e95
Add specs for existing behaviour in order page
kristinalim Sep 1, 2018
cd41498
Ask to login when not authenticated for order page
kristinalim Sep 1, 2018
f9533f8
Refactor redirecting back after requiring login
kristinalim Sep 6, 2018
6d5f855
Add "more" translation key
kristinalim Sep 6, 2018
d06bccb
Change i18n key for Store link in admin header
kristinalim Sep 6, 2018
937da27
Merge pull request #2628 from openfoodfoundation/dependabot/bundler/r…
mkllnk Sep 7, 2018
b9fe1ce
Replace therubyracer with mini_racer
frank-west-iii Jul 3, 2018
d6c2a36
Blacklist libv8 version that breaks mini_racer
mkllnk Sep 7, 2018
3e0c744
Merge pull request #2604 from Matt-Yorkley/pi/updating_variants_bug
mkllnk Sep 7, 2018
62f5228
Merge pull request #2643 from luisramos0/transifex_manual
mkllnk Sep 7, 2018
f1d5088
Add translations for order cancellation emails
kristinalim Sep 7, 2018
2cf608f
Add translations for shipment emails
kristinalim Sep 7, 2018
40443b1
Add translations for headers in enterprise index
kristinalim Sep 7, 2018
86f4a11
Translate placeholder for order cycle name filter
kristinalim Sep 7, 2018
c64acf4
Fix translation key for "involving" in OC filters
kristinalim Sep 7, 2018
fc79aae
Translate authorized shops headers in account page
kristinalim Sep 7, 2018
9dcdb67
Translate inherits_properties label in product form
kristinalim Sep 7, 2018
2c2dd62
Translate "COPY OF" when cloning an OC
kristinalim Sep 7, 2018
003e65f
Translate error when failing to create order cycle
kristinalim Sep 7, 2018
5e0997d
Merge pull request #2635 from apoc64/timezone_comments
mkllnk Sep 8, 2018
02a909c
Do not use image_tag for enterprise image previews
kristinalim Sep 8, 2018
980c46c
Convert Spree view to HAML
Matt-Yorkley Sep 11, 2018
5a2491c
Apply ng-app override
Matt-Yorkley Sep 11, 2018
c7e2f81
Apply colgroup override
Matt-Yorkley Sep 11, 2018
1958ac9
Apply distributor filter inputs override
Matt-Yorkley Sep 11, 2018
6389c55
Apply distributor th override
Matt-Yorkley Sep 11, 2018
ba07014
Apply distributor td override
Matt-Yorkley Sep 11, 2018
8f174b1
Apply ship shortcut override
Matt-Yorkley Sep 11, 2018
afedaea
Apply special instructions override
Matt-Yorkley Sep 11, 2018
507f4d0
OCD tidy up of visually misaligned filter
Matt-Yorkley Sep 11, 2018
f08d638
Apply capture order override
Matt-Yorkley Sep 11, 2018
4d9ebf0
Apply submenu override
Matt-Yorkley Sep 11, 2018
64e71a1
Merge pull request #2544 from kristinalim/fix-scrolling_in_modals
sauloperez Sep 12, 2018
e474271
Merge pull request #2637 from Vadlusk/remove_css_splitter
sauloperez Sep 12, 2018
91c0de3
Bump db2fog from 0.8.0 to 0.9.0
dependabot-support Sep 12, 2018
cc43d78
Refacto edit method for content controller and enable custom user gui…
HugsDaniel Sep 12, 2018
3f5c799
Merge pull request #2648 from kristinalim/fix-ask_anonymous_users_to_…
sauloperez Sep 12, 2018
409f084
Added matomo opt out iframe to cookies policy page
luisramos0 Sep 2, 2018
478dd68
In cookies policy helper, added string interpolation to variable to a…
luisramos0 Sep 11, 2018
a447fe4
Require lib file where needed
mkllnk Sep 11, 2018
d7b1975
Add spec for GH issue #2655
mkllnk Sep 11, 2018
81f60aa
Make PaymentMethod serialisable with fees
mkllnk Sep 13, 2018
f46c1e8
Merge pull request #2424 from frank-west-iii/issue-2100-mini-racer
mkllnk Sep 13, 2018
5e722bf
Merge pull request #2634 from luisramos0/cookies_matomo_optout
mkllnk Sep 13, 2018
065df96
Merge pull request #2675 from Matt-Yorkley/bi/remake_views
mkllnk Sep 13, 2018
b676bfd
Bump jwt from 1.5.4 to 1.5.6
dependabot-support Sep 13, 2018
2e635f9
Make job queuing more robust and efficient
mkllnk Sep 13, 2018
ec953e1
Style cache refreshment class
mkllnk Sep 13, 2018
8dd0e01
Use explicit syntax for section objects in preference_sections defini…
HugsDaniel Sep 13, 2018
1000bd4
Merge pull request #2658 from kristinalim/translations-order_and_ship…
mkllnk Sep 14, 2018
6b56def
Merge pull request #2697 from mkllnk/2655-fix-admin-payments
mkllnk Sep 14, 2018
514f64c
Merge pull request #2650 from kristinalim/translations-more_admin_header
mkllnk Sep 14, 2018
43a3ecf
Merge pull request #2612 from openfoodfoundation/dependabot/bundler/j…
mkllnk Sep 14, 2018
da2f278
Merge pull request #2649 from kristinalim/translations-fix_store_link…
mkllnk Sep 14, 2018
eabb9f4
Merge pull request #2659 from kristinalim/translations-admin_area_fixes
mkllnk Sep 14, 2018
beedd93
Merge pull request #2512 from kristinalim/feature-remove_enterprise_i…
mkllnk Sep 14, 2018
e836ac0
Merge pull request #2686 from HugsDaniel/2593_customize_user_guide_link
mkllnk Sep 14, 2018
c3f461a
Merge pull request #2622 from openfoodfoundation/dependabot/bundler/d…
mkllnk Sep 14, 2018
05225aa
[Security] Bump uglifier from 2.7.1 to 4.1.19
dependabot-support Sep 14, 2018
ce7be68
Merge pull request #2660 from kristinalim/translations-failed_oc_crea…
mkllnk Sep 14, 2018
ac85b90
Clarify private class method declaration
mkllnk Sep 15, 2018
798a6ed
Translate more text in OC filters
kristinalim Sep 13, 2018
0520f21
Merge pull request #2540 from luisramos0/delete_dead_store
sauloperez Sep 17, 2018
0f627cd
Merge pull request #2661 from kristinalim/translations-copy_of_order_…
sauloperez Sep 17, 2018
e577bcb
Prepare angular controller and serialized data
Matt-Yorkley Sep 12, 2018
d170a4d
New domain Web (rails engine) with the following features extracted f…
luisramos0 Aug 7, 2018
dc5eb64
Change web/all.css from sprockets to SASS and include web/all.css thr…
luisramos0 Sep 17, 2018
bded530
Moved web api endpoint from /api to /web/api
luisramos0 Sep 17, 2018
95f2f92
Extracted cookies footer links from view to footer links helper
luisramos0 Sep 17, 2018
c22ac00
Moved cookies_policy_helper to Web engine and respective spec
luisramos0 Sep 17, 2018
ccf7d91
Bump oj from 2.1.2 to 3.6.10
dependabot-support Sep 17, 2018
19df4ff
Merge pull request #2701 from mkllnk/2700-improve-product-refresh-sch…
mkllnk Sep 18, 2018
13f73b4
Test :restart_checkout state machine event
sauloperez Sep 13, 2018
99cdeca
Remove useless RSpec context block
sauloperez Sep 17, 2018
1fdc578
Increase readability (a bit) of OrderUpdater
sauloperez Sep 17, 2018
2a0e0ee
Move state_machine's additions inside class_eval
sauloperez Sep 18, 2018
9f7d249
Merge pull request #2671 from kristinalim/translations-any_enterprise…
sauloperez Sep 18, 2018
258347b
Updating translations for config/locales/fr.yml
Transifex-Openfoodnetwork Sep 18, 2018
f0d015b
Updating translations for config/locales/de_DE.yml
Transifex-Openfoodnetwork Sep 18, 2018
93d273f
Convert orders index table to use angular ng-repeat
Matt-Yorkley Sep 12, 2018
524f9af
Drop unused db column line_items.shipping_method_name
luisramos0 Sep 19, 2018
3b9d9db
Add pagination
Matt-Yorkley Sep 13, 2018
2112f29
Angularise filters
Matt-Yorkley Sep 13, 2018
9da6a5a
Add column sorting to table
Matt-Yorkley Sep 17, 2018
68f0c80
Add loading message and spinner
Matt-Yorkley Sep 17, 2018
b2551b4
Rewrite existing specs
Matt-Yorkley Sep 17, 2018
6768055
Split orders into 2 angular controllers
Matt-Yorkley Sep 18, 2018
64620c2
Tidy up response formats for easier testing
Matt-Yorkley Sep 18, 2018
9ce32e3
Add new ordersCtrl spec
Matt-Yorkley Sep 18, 2018
ba25480
Move angular_pagination to /views/admin/shared/
Matt-Yorkley Sep 19, 2018
3cbb576
Move payment object logic out of order serializer and delete code
Matt-Yorkley Sep 19, 2018
c4d4b52
Merge pull request #2742 from openfoodfoundation/transifex
HugsDaniel Sep 19, 2018
454cd8b
Updating translations for config/locales/nb.yml
Transifex-Openfoodnetwork Sep 19, 2018
a2b3d83
Reduce complexity of OrderUpdater decorator
sauloperez Sep 18, 2018
62bebdb
Merge pull request #2698 from openfoodfoundation/dependabot/bundler/u…
sauloperez Sep 19, 2018
0ac16ce
Get useful feedback from Rubocop Metrics cops
sauloperez Sep 17, 2018
b57c6cf
Add errors when attempting to update non-updatable fields
Matt-Yorkley Aug 20, 2018
cc98cc8
Prefer #public_send over #send
Matt-Yorkley Sep 1, 2018
ebb18e9
Remove unneccesary method
Matt-Yorkley Sep 1, 2018
fc68e28
Add :description to non-updatable attributes list
Matt-Yorkley Sep 1, 2018
0e6b0aa
Deleted sample specs and one pending spec
luisramos0 Sep 19, 2018
5763bf0
Update all translations
mkllnk Sep 20, 2018
897e43f
Remove Spree's Deface data-hooks from new view
Matt-Yorkley Sep 20, 2018
3dd1fcb
Merge pull request #2749 from luisramos0/delete-li-ship-method-name
sauloperez Sep 20, 2018
20077c9
Merge pull request #2618 from coopdevs/enable-style-send-cop
sauloperez Sep 20, 2018
2a68184
Deleted unused test helper for rabl views
luisramos0 Sep 20, 2018
33d2b65
Removed deprecated spec helper have_select2_option and fixed its last…
luisramos0 Sep 20, 2018
e2fd5a3
Merge pull request #2757 from luisramos0/delete_dead_specs
mkllnk Sep 21, 2018
7175434
Updating translations for config/locales/en_US.yml
Transifex-Openfoodnetwork Sep 21, 2018
89be54f
Merge pull request #2750 from openfoodfoundation/transifex
mkllnk Sep 22, 2018
f0bb927
Merge pull request #2734 from coopdevs/make-rubocop-useful
mkllnk Sep 23, 2018
9f57b43
Move sortble header elements to a partial
Matt-Yorkley Sep 23, 2018
9d48ea7
Merge pull request #2759 from luisramos0/del_old_spec_helper
mkllnk Sep 24, 2018
b841705
Merge pull request #2741 from coopdevs/refactor-checkout-process-bits
sauloperez Sep 24, 2018
f743b5f
Extract Settings from Product Import processor
sauloperez Sep 13, 2018
6f2760c
Move translations into their namespace and use '.key' format
Matt-Yorkley Sep 24, 2018
4a7ee9b
Remove no longer used rake task
sauloperez Sep 24, 2018
1d9243a
DRY and clarify serializer and service
Matt-Yorkley Sep 24, 2018
97775c0
Updating translations for config/locales/fr_CA.yml
Transifex-Openfoodnetwork Sep 24, 2018
bf1f2b9
Merge pull request #2768 from coopdevs/fire-unused-users-task
mkllnk Sep 25, 2018
51f9a0a
Merge pull request #2562 from Matt-Yorkley/pi/product_attributes
mkllnk Sep 25, 2018
e93d46e
Use .find instead of .select().first
Matt-Yorkley Sep 25, 2018
2dcc8ea
Add spec for pending payments service
Matt-Yorkley Sep 25, 2018
a23b1b9
Make Web engine an isolated namespace engine mounted on / (without /w…
luisramos0 Sep 25, 2018
b1c7e6c
Fix assets precompilation by including web/all.js and web/all.css in …
luisramos0 Sep 26, 2018
9211053
Move angular-templates route and controller into Web engine
luisramos0 Sep 25, 2018
600c8fc
Send confirmation emails immediately
mkllnk Sep 14, 2018
3ae073d
Convert specs to RSpec 3.7.1 syntax with Transpec
mkllnk Sep 14, 2018
17d951f
Rescue from any sign-up errors
mkllnk Sep 14, 2018
9dcc683
Notify Bugsnag on sign-up errors
mkllnk Sep 17, 2018
af1ac33
Create MailMethod before User when seeding
mkllnk Sep 17, 2018
f0021be
Style I18n call
mkllnk Sep 27, 2018
d488ae3
Merge pull request #2725 from mkllnk/2699-email-confirm-jobs
mkllnk Sep 27, 2018
54b17ac
Use Spree::Order.pending_payments and remove service
Matt-Yorkley Sep 27, 2018
16badcd
Setup Simplecov to have code coverage analysis
sauloperez Sep 27, 2018
3cf1002
Fix bug on slow page loads where banner and policy modal were both lo…
luisramos0 Sep 27, 2018
3150741
Extract ResetAbsent class from EntryProcessor
sauloperez Sep 21, 2018
663db47
Move products_reset_count to ResetAbsent
sauloperez Sep 24, 2018
ed073e9
Rely on Settings and don't access internal struct.
sauloperez Sep 24, 2018
b5766a2
Extract common conditional clauses
sauloperez Sep 24, 2018
5ac3598
Inject Settings object in ResetAbsent
sauloperez Sep 24, 2018
e041624
Move code comment to be the method's doc
sauloperez Sep 24, 2018
c955e15
Pass enterprise ids as strs as current code does
sauloperez Sep 24, 2018
b940f06
Return early if reset_all_absent is not set
sauloperez Sep 24, 2018
fd84bea
Test that variants or overrides are actually reset
sauloperez Sep 25, 2018
a409353
Move import_settings query methods to Settings
sauloperez Sep 25, 2018
2347134
Do not call ResetAbsent when preconditions not met
sauloperez Sep 25, 2018
8d7a11b
Make all steps of the algorithm have 2 branches
sauloperez Sep 25, 2018
a9444b8
Extract InventoryReset and Products strategies
sauloperez Sep 25, 2018
a10e58e
Inject strategy_factory into ResetAbsent
sauloperez Sep 25, 2018
54d6bc5
Don't use importing_into_inventory? in ResetAbsent
sauloperez Sep 25, 2018
95ae18a
Remove method delegation
sauloperez Sep 25, 2018
f04fa4e
Do not treat ResetAbsent as a decorator anymore
sauloperez Sep 25, 2018
718f529
Use nested module in test to improve readability
sauloperez Sep 25, 2018
186801a
Remove unused supplier_ids argument
sauloperez Sep 25, 2018
5eb10ed
Inject #updated_ids to strategy
sauloperez Sep 25, 2018
d527f62
Remove pointless sum
sauloperez Sep 26, 2018
fd69c76
Add specs for ResetAbsent strategies
sauloperez Sep 26, 2018
8715fce
Remove @import_settings in favor of Settings
sauloperez Sep 27, 2018
af93af1
Replace strategy with a more explicit name
sauloperez Oct 1, 2018
148321f
Make strategies class names more explicit
sauloperez Oct 1, 2018
82654cd
Turn delegation to a reader to make it simpler
sauloperez Oct 1, 2018
6a7359a
Pass supplier_ids in strategy #reset instead
sauloperez Oct 1, 2018
017e3d1
Use variable colour assignment
Matt-Yorkley Oct 2, 2018
55d7d5d
Rename #capture_path to #payment_capture_path
Matt-Yorkley Oct 2, 2018
6ddcb01
Merge pull request #2736 from openfoodfoundation/dependabot/bundler/o…
sauloperez Oct 2, 2018
aa78b9e
Merge pull request #2777 from coopdevs/setup-simplecov
sauloperez Oct 2, 2018
daafe73
Delete representative_view dependency, not used
luisramos0 Oct 2, 2018
8a6da74
Bump rspec-retry from 0.5.6 to 0.6.1
dependabot-support Oct 2, 2018
f99ed81
Make 'Clear All' button work on order cycle page
nikobozi Oct 4, 2018
b139f38
Merge pull request #2806 from luisramos0/rep
sauloperez Oct 4, 2018
7a1cffb
Updated build status badge
73VW Oct 4, 2018
58a99a7
Merge pull request #2692 from Matt-Yorkley/bi/angular_orders
sauloperez Oct 4, 2018
da904c9
Fix product import date when not all variants have it
kristinalim Oct 5, 2018
574f031
Fix typo in matomo optout iframe url in cookies_policy_helper
luisramos0 Oct 5, 2018
8b59943
Updating translations for config/locales/de_DE.yml
Transifex-Openfoodnetwork Oct 8, 2018
37a7cce
Fix bindings on angular orders data
Matt-Yorkley Oct 8, 2018
f5573f4
Merge pull request #2778 from coopdevs/refactor-entry-processor
sauloperez Oct 8, 2018
ea6e522
Merge pull request #2826 from 73VW/master
sauloperez Oct 8, 2018
3ec8c12
Update account setting spec for updating email address
Matt-Yorkley Oct 8, 2018
8f5fd41
Update email confirmation address
Matt-Yorkley Oct 8, 2018
68c58dc
Merge pull request #2770 from openfoodfoundation/transifex
mkllnk Oct 9, 2018
5606550
Merge pull request #2815 from openfoodfoundation/dependabot/bundler/r…
sauloperez Oct 9, 2018
4cbc449
Remove unused parallel_tests gem
mkllnk Oct 9, 2018
245d900
Remove unused CI scripts
mkllnk Oct 9, 2018
c2c492c
Updating translations for config/locales/es.yml
Transifex-Openfoodnetwork Oct 9, 2018
edca209
Merge pull request #2844 from Matt-Yorkley/bi/angular_orders_changing…
Matt-Yorkley Oct 9, 2018
900c65e
Merge pull request #2855 from openfoodfoundation/transifex
Matt-Yorkley Oct 9, 2018
8596215
Merge pull request #2821 from nikobozi/oc-clear-filter
sauloperez Oct 9, 2018
227dd3e
Merge pull request #2831 from kristinalim/fix-product_import_date_error
sauloperez Oct 9, 2018
1bafa0c
Merge pull request #2853 from mkllnk/remove-parallel-tests
sauloperez Oct 10, 2018
dafcd0d
Add per_page controls to admin orders index
Matt-Yorkley Sep 25, 2018
2d60b31
Wrap and improve comment block readability
sauloperez Oct 4, 2018
f54c69c
Add first test case for ProductSet
sauloperez Oct 4, 2018
d437265
Make #update_attributes parseable by humans
sauloperez Oct 4, 2018
575d76e
Cover variant creation and update with basic tests
sauloperez Oct 4, 2018
a2228d4
Make ProductSet parseable by humans
sauloperez Oct 4, 2018
cbac916
Validate unit value when updating variant_unit
sauloperez Oct 8, 2018
c8c16f0
Use Rails 3.2 validates syntax
sauloperez Oct 8, 2018
5bd375d
Favor early return over dumb else branch
sauloperez Oct 8, 2018
60d05a9
Fix variants with 'weight' and missing unit_value
sauloperez Oct 10, 2018
ebb0390
Increase rubocop line limit to 100
Matt-Yorkley Oct 11, 2018
8a0a33d
Merge pull request #2858 from Matt-Yorkley/rubocop_line_limit
Matt-Yorkley Oct 12, 2018
fcff835
Update results on dropdown select
Matt-Yorkley Oct 12, 2018
fe14996
Merge pull request #2521 from luisramos0/cookies_in_engine
sauloperez Oct 15, 2018
0e4a3db
Merge pull request #2845 from coopdevs/fix-invalid-variant-creation
sauloperez Oct 15, 2018
8946fe3
Merge pull request #2829 from Matt-Yorkley/bi/results_per_page
sauloperez Oct 15, 2018
f8bccda
Merge pull request #2847 from Matt-Yorkley/emails/validation
sauloperez Oct 15, 2018
87cd73d
Merge branch 'master' into 2-0-stable-oct
luisramos0 Oct 15, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "2"
plugins:
rubocop:
enabled: true
channel: "rubocop-0-55"
channel: "rubocop-0-57"
scss-lint:
enabled: true
checks:
Expand All @@ -19,23 +19,23 @@ checks:
argument-count:
enabled: false
complex-logic:
enabled: true
enabled: false
file-lines:
enabled: true
enabled: false
method-complexity:
enabled: true
enabled: false
method-count:
enabled: false
method-lines:
enabled: false
nested-control-flow:
enabled: true
enabled: false
return-statements:
enabled: true
enabled: false
similar-code:
enabled: true
enabled: false
identical-code:
enabled: true
enabled: false
exclude_patterns:
- "spec/**/*"
- "vendor/**/*"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ libpeerconnection.log
/config/application.yml
node_modules
vendor/bundle/
coverage
4 changes: 0 additions & 4 deletions .rspec_parallel

This file was deleted.

27 changes: 14 additions & 13 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,16 @@ inherit_from:
AllCops:
TargetRubyVersion: 2.1
TargetRailsVersion: 3.2
Include:
- '**/Rakefile'
- '**/config.ru'
Exclude:
- 'db/**/*'
- 'config/**/*'
- 'script/**/*'
- 'vendor/**/*'
- 'node_modules/**/*'
- !ruby/regexp /old_and_unused\.rb$/
# The parser gem fails to parse this file with out current Ruby version.
- 'spec/factories.rb'
# Excluding: inadequate Naming/FileName rule rejects GemFile name with camelcase
- 'engines/web/Gemfile'

# OFN SETTINGS
# Cop settings that have been agreed upon by the OFN community
Expand All @@ -33,6 +31,9 @@ Style/HashSyntax:
Enabled: true
EnforcedStyle: ruby19_no_mixed_keys

Style/Send:
Enabled: true

Layout/MultilineMethodCallIndentation:
Enabled: true
EnforcedStyle: indented
Expand Down Expand Up @@ -174,28 +175,28 @@ Lint/AssignmentInCondition:
StyleGuide: http://relaxed.ruby.style/#lintassignmentincondition

Metrics/AbcSize:
Enabled: false
Max: 15

Metrics/BlockNesting:
Enabled: false
Max: 3

Metrics/ClassLength:
Enabled: false
Max: 100

Metrics/ModuleLength:
Enabled: false
Max: 100

Metrics/CyclomaticComplexity:
Enabled: false
Max: 6

Metrics/LineLength:
Enabled: false
Max: 100

Metrics/MethodLength:
Enabled: false
Max: 10

Metrics/ParameterLists:
Enabled: false
Max: 5

Metrics/PerceivedComplexity:
Enabled: false
Max: 7
Loading