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

Moderation module for comments #59

Open
wants to merge 9,364 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9364 commits
Select commit Hold shift + click to select a range
21ad46f
Change js depending of window with
decabeza Feb 15, 2019
6459892
Hide select text if budget finished
decabeza May 17, 2019
394dd21
Add help text to admin newsletter new
decabeza May 17, 2019
be83546
Include mailer header logo on custom images list
decabeza May 17, 2019
489cab9
Merge pull request #2006 from AyuntamientoMadrid/menu-users
decabeza May 17, 2019
c8c6ffe
Merge pull request #2005 from AyuntamientoMadrid/admin-ui
decabeza May 17, 2019
83770a0
Prevent notice been overlapped by header
decabeza May 21, 2019
8d1181b
Merge pull request #1745 from AyuntamientoMadrid/proposals-support-mo…
decabeza May 21, 2019
0647394
Remove Rspec deprecation warning
microweb10 May 21, 2019
738a803
Allow lines to be 110 characters long
microweb10 May 21, 2019
ec7b137
Merge pull request #2015 from AyuntamientoMadrid/rubocop_line_long_to…
microweb10 May 23, 2019
0f768bc
Merge pull request #2014 from AyuntamientoMadrid/remove_rspec_depreca…
microweb10 May 23, 2019
9cd6db2
Use double quotes in controllers/
microweb10 Mar 13, 2019
f2a4a72
Use double quotes in models
microweb10 Mar 13, 2019
c86997c
Merge pull request #2010 from AyuntamientoMadrid/double_quotes_for_co…
microweb10 May 23, 2019
1a2afb5
Merge pull request #2011 from AyuntamientoMadrid/double_quotes_for_mo…
microweb10 May 23, 2019
a1c1554
Resize Capybara window back to its original size
javierm May 24, 2019
483df2d
Merge pull request #2018 from AyuntamientoMadrid/fix_capybara_window
javierm May 24, 2019
0290221
Generate navigation links for polls without a slug
javierm May 21, 2019
0c5fab5
Add custom styles for budget next phases
decabeza May 24, 2019
fe160b9
Use double quotes in app/views/admin/
microweb10 Mar 14, 2019
da016d9
Use double quotes in app/views/dashboard/
microweb10 May 21, 2019
0fa49d2
Use double quotes in app/views/budgets/
microweb10 May 21, 2019
656398c
Use double quotes in app/views/layouts
microweb10 May 21, 2019
ac008c2
Use double quotes in app/views/pages
microweb10 May 21, 2019
2fa2239
Use double quotes in app/views/polls
microweb10 May 21, 2019
c5d7027
Use double quotes in app/views/custom/pages
microweb10 May 21, 2019
312d11f
Use double quotes in app/views/custom/probes
microweb10 May 21, 2019
fdec781
Use double quotes in app/views/custom
microweb10 May 21, 2019
45143ba
Use double quotes in app/views
microweb10 May 21, 2019
26bb960
Merge pull request #2016 from AyuntamientoMadrid/budgets-voting-phase
decabeza May 24, 2019
ea7358b
Merge pull request #2012 from AyuntamientoMadrid/double_quotes_for_views
microweb10 May 27, 2019
162c17b
Use double quotes in app/assets
microweb10 May 21, 2019
243e692
Use double quotes in app/helpers
microweb10 May 21, 2019
f3cbef2
Use double quotes in app/mailers
microweb10 May 21, 2019
f858b16
Use double quotes in config/initializers
microweb10 May 21, 2019
2b5d58a
Use double quotes in config/routes
microweb10 May 21, 2019
a9e9cb2
Use double quotes in config/
microweb10 May 21, 2019
da90736
Use double quotes in lib/
microweb10 May 21, 2019
2dbf1da
Use double quotes
microweb10 May 21, 2019
b48ffcf
Merge pull request #2013 from AyuntamientoMadrid/double_quoutes_every…
microweb10 May 27, 2019
30b86c1
Add selected attribute to proposals
microweb10 Apr 11, 2019
dc381ce
Allow admins to select proposals and users to list them
microweb10 Apr 16, 2019
dac9fb2
Share helper between class Proposal and Legislation::Proposal
microweb10 May 23, 2019
7148b1e
Change links for proposals lists
microweb10 Apr 16, 2019
20a1257
Extract proposal supports progress bar to a partial
microweb10 May 10, 2019
bf0d7fb
Show completed progress bar for successful proposals
microweb10 May 10, 2019
5912c85
Remove not selected proposals from other lists
microweb10 May 24, 2019
6cf9e2b
Remove budget recommendations (delegation) feature
decabeza May 21, 2019
c3bf40f
Merge pull request #2009 from AyuntamientoMadrid/remove-delegation
decabeza May 28, 2019
777c18e
Show a 'Selected proposal' message in the show view
microweb10 May 24, 2019
d86981e
Don't show featured proposals in selected proposals list
microweb10 May 24, 2019
4d7590b
Don't show recommented proposals in selected proposals list
microweb10 May 24, 2019
9eb47ee
Don't show order links in selected proposals list
microweb10 May 24, 2019
1d22484
Merge pull request #2017 from AyuntamientoMadrid/poll_links
javierm May 28, 2019
ed2ad27
Merge pull request #1969 from AyuntamientoMadrid/select_proposals_by_…
microweb10 May 28, 2019
340c534
Simplify MergedCommentTree#initialize
javierm Aug 24, 2018
b6d5b83
Use AR relations when merging comments
javierm Aug 24, 2018
238c622
Remove redundant comments
javierm Dec 7, 2018
4eb3b6b
Simplify code seeding settings
javierm Dec 7, 2018
294f493
Move default settings to Settings model
javierm Dec 7, 2018
3522b65
Sort settings alphabetically
javierm Dec 7, 2018
ffd6edf
Extract method to reset default settings
javierm Dec 7, 2018
d9bc5fb
Reuse default settings in dev seeds
javierm Dec 7, 2018
69fe5f1
Remove commented code
javierm Dec 7, 2018
4b06a97
Add button to delete a poll
decabeza May 14, 2019
cfcbad0
Replace name label on dashboard polls form
decabeza May 29, 2019
f4c6edf
Refactor dashboard polls controller
decabeza May 29, 2019
3f16cce
Allow users to delete dashboard polls
decabeza May 29, 2019
4cee108
Add help text to email and poster proposals settings
decabeza May 27, 2019
adf73ef
Simplify dev seed settings code
javierm Dec 7, 2018
9f77be5
Extract partial with mobile sticky content
decabeza May 29, 2019
fac85c7
Extract partial with mobile sticky content on custom view
decabeza May 29, 2019
3ef4f74
Show archived proposals in selected proposals list
microweb10 May 29, 2019
cbc824b
Merge pull request #1746 from AyuntamientoMadrid/default_settings
javierm May 29, 2019
9c2586d
Add method to add new settings
javierm Dec 7, 2018
249b84a
Add new settings every time we deploy
javierm Dec 7, 2018
7233680
Remove obsolete task
javierm Dec 7, 2018
3afb03f
Merge pull request #1615 from javierm/1180-flaky_annotations_comments
javierm May 29, 2019
9df36bc
Add link to process on legislation processes proposals
decabeza May 29, 2019
eb66624
Add link to process on custom legislation processes proposals
decabeza May 29, 2019
83d24fd
Add link to comment path on comment date
decabeza May 29, 2019
59e0b8c
Add show and collapse text on comments tree
decabeza May 29, 2019
ba351c9
Remove send notification proposal from community
decabeza May 29, 2019
828e301
Create new messages section for proposal's dashboard
decabeza May 30, 2019
c35e11c
Move link to selected proposals on proposals index
decabeza May 30, 2019
78f52ee
Move link to selected proposals on custom proposals index
decabeza May 30, 2019
691a89e
Merge pull request #2024 from AyuntamientoMadrid/fix_selected_proposa…
microweb10 May 30, 2019
e792b3e
Fix valid ballots label
javierm May 30, 2019
715b45d
Display the same results for stats and recounts
javierm May 30, 2019
053bab1
Include blank and null ballots in booth totals
javierm May 30, 2019
e46b606
Merge pull request #2027 from AyuntamientoMadrid/valid_votes
javierm May 30, 2019
15a3302
Merge pull request #1995 from AyuntamientoMadrid/user-polls
decabeza May 31, 2019
7487d3c
Merge pull request #2019 from AyuntamientoMadrid/improve-ux
decabeza May 31, 2019
1c54347
Merge pull request #2022 from AyuntamientoMadrid/proposal-show
decabeza May 31, 2019
2296049
Merge pull request #2023 from AyuntamientoMadrid/remove-dashboard-polls
decabeza May 31, 2019
f554d39
Remove duplicate code
javierm May 31, 2019
a491593
Order translations using ruby
javierm May 31, 2019
be1101a
Merge pull request #2025 from AyuntamientoMadrid/new_settings
javierm May 31, 2019
a656dfb
Extract settings forms to partials
microweb10 May 14, 2019
3824599
Extract setting prefix to a method
microweb10 May 14, 2019
1a596cf
Add images and document settings to the DB
microweb10 May 16, 2019
452a3af
Add images and documents settings to admin panel
microweb10 May 16, 2019
1ecb97d
Replace harcoded images and documents settings
microweb10 May 16, 2019
00683a7
Fix accidental translations join
javierm May 31, 2019
129854b
Show name and email for deleted poll officer's user account
microweb10 May 31, 2019
27b8fc7
Update link to selected proposals on proposals spec
decabeza May 31, 2019
a2f476f
Merge pull request #2034 from AyuntamientoMadrid/selected-proposals-spec
decabeza Jun 1, 2019
748459a
Replace custom image on welcome header
decabeza Jun 3, 2019
d4d1bdd
Merge pull request #2029 from AyuntamientoMadrid/duplicate_translations
javierm Jun 3, 2019
8f0a819
Add task to upgrade to version 1.0.0
javierm Jun 3, 2019
27335ae
Add capistrano task to deploy and upgrade CONSUL
javierm Jun 3, 2019
f587168
Move calculate_ballot_lines task to the right file
javierm Jun 3, 2019
066e768
Add info messages for release 1.0.0 tasks
javierm Jun 3, 2019
dbb48bc
Extract partial to render finished budgets
javierm May 27, 2019
e58b652
Use the same view code for finished budgets
javierm May 27, 2019
a5a48e7
Update translations from Crowdin
voodoorai2000 May 30, 2019
d6c6551
Remove obsolete translation key
voodoorai2000 May 31, 2019
6ecbb9d
Merge pull request #2008 from AyuntamientoMadrid/images_and_documents…
microweb10 Jun 4, 2019
0661c13
Extract partial to render budget navigation links
javierm Jun 4, 2019
74e7740
Don't show links to budget results if disabled
javierm Jun 4, 2019
752e10b
Hide view mode on selected proposals list
decabeza Jun 4, 2019
fcbd81d
Hide view mode on custom selected proposals list
decabeza Jun 4, 2019
8d684c9
Hide proposal code on selected proposals
decabeza Jun 4, 2019
bee3444
Merge pull request #2030 from AyuntamientoMadrid/crowdin
voodoorai2000 Jun 4, 2019
a777a98
Hide related content on selected proposals
decabeza Jun 4, 2019
c4acee8
Hide related content on custom selected proposals
decabeza Jun 4, 2019
bad4e21
Add Bosnian, Czech, Danish, Greek, Croatian and Turkish locales
voodoorai2000 May 31, 2019
a99f88f
Update locale names for Italian, Polish and Albanian
voodoorai2000 May 31, 2019
e0f9233
Add original_heading_id to investments
voodoorai2000 May 31, 2019
6038a0c
Hide comments count on selected proposals
decabeza Jun 4, 2019
bcb2838
Refactor selected proposals specs
decabeza Jun 4, 2019
365dddb
Merge pull request #2032 from AyuntamientoMadrid/unregistered_poll_of…
microweb10 Jun 4, 2019
21274be
Fix proposal variable on support status partial
decabeza Jun 5, 2019
4d10467
Merge pull request #2039 from AyuntamientoMadrid/sticky-partial
decabeza Jun 5, 2019
9e76428
Add new settings on servers with the `db` role
javierm Jun 5, 2019
112f21a
Merge pull request #2031 from AyuntamientoMadrid/available_locales
voodoorai2000 Jun 6, 2019
d9069e7
Add rake task to set the original_heading_id value
voodoorai2000 May 31, 2019
1077447
Merge pull request #2037 from AyuntamientoMadrid/fix_results_links
javierm Jun 6, 2019
c5b6a03
Merge pull request #2035 from AyuntamientoMadrid/add_upgrade_task
javierm Jun 6, 2019
f31365e
Add related content section on proposal dashboard
decabeza Jun 6, 2019
0e06164
Avoid error when accessing final votes stats before balloting phase
microweb10 Jun 6, 2019
ad2bbc4
Merge pull request #2033 from AyuntamientoMadrid/investment_heading_id
voodoorai2000 Jun 7, 2019
64f13a2
Merge pull request #2040 from AyuntamientoMadrid/admin_stats_before_v…
microweb10 Jun 10, 2019
cf4c6b8
Update custom pdf proposal form
decabeza Jun 11, 2019
8410b61
Remove system count column for old polls
javierm Jun 1, 2019
ff74f0e
Simplify recounts code
javierm Jun 1, 2019
01265c6
Fix indentation
javierm Jun 1, 2019
a71f96a
Remove system count from old booth assigments
javierm Jun 1, 2019
f9ea7e4
Prevent flaky specs because of globalize fallbacks initialization
Senen Apr 5, 2019
70d6dcb
Merge pull request #2036 from AyuntamientoMadrid/remove_system_total
javierm Jun 11, 2019
eed3094
Avoid error for polls results
microweb10 Jun 11, 2019
a7ec556
Merge pull request #2038 from AyuntamientoMadrid/selected-proposals
decabeza Jun 12, 2019
b390892
Merge pull request #2041 from AyuntamientoMadrid/dashboard-related-co…
decabeza Jun 12, 2019
d896889
Merge pull request #2043 from AyuntamientoMadrid/fix_dasboard_poll_re…
microweb10 Jun 14, 2019
fd39bd7
Merge pull request #2042 from AyuntamientoMadrid/upstream-fix_globali…
javierm Jun 14, 2019
9300147
Hide polls created by users on admin poll booth assigments
decabeza Jun 14, 2019
6b356de
Merge pull request #2045 from AyuntamientoMadrid/admin-booth-assignments
javierm Jun 15, 2019
7a1bc44
Merge pull request #1972 from AyuntamientoMadrid/dependabot/bundler/n…
Senen Jul 12, 2019
9a5eced
Load custom locales after everything is loaded
javierm Jul 15, 2019
ed62609
Add specs
taitus Jul 16, 2019
a951070
Merge pull request #2048 from AyuntamientoMadrid/i18n-load-path
Senen Jul 17, 2019
157416a
Add executions as Report::KINDS
taitus Jul 22, 2019
1fa3f25
Allow to Administrators display/hide executions from Budget
taitus Jul 22, 2019
1eaf45a
Display/Hide executions tab on Results/Stats Budget Page
taitus Jul 22, 2019
6351d1d
Display/Hide executions link on Budgets Index
taitus Jul 22, 2019
9a4d048
Add locales
taitus Jul 23, 2019
0a7b625
Merge pull request #2049 from AyuntamientoMadrid/executions-tab-manag…
taitus Oct 29, 2019
015e0c8
Basic scaffold for ModeratedTexts resource
aitbw Jan 8, 2020
400f03b
Add ModeratedText model and database table
aitbw Jan 8, 2020
de9eb12
Adapt ModeratedTexts#index view to its related model
aitbw Jan 8, 2020
db8a7f5
Create basic ModeratedText#new view
aitbw Jan 9, 2020
76b161b
Allow admins to add moderated words
aitbw Jan 9, 2020
77024e8
Add buttons for edit/delete actions on ModeratedTexts#index
aitbw Jan 9, 2020
a59ce2c
Add missing English locales
aitbw Jan 9, 2020
20231c2
Allow admins to delete moderated words
aitbw Jan 9, 2020
9f89ff3
Allow admins to upload CSV file containing moderated texts
aitbw Jan 14, 2020
4a9e900
Add feature and unit specs for moderated texts feature
aitbw Jan 15, 2020
ba81423
Allow admins to modify moderated words
aitbw Jan 15, 2020
26f4d5b
Define 'moderated_contents' database table
aitbw Jan 16, 2020
3e4e685
Define ModeratedContent model and its relations
aitbw Jan 17, 2020
3878f51
Basic structure for automatically moderated content Admin panel
aitbw Jan 22, 2020
9856091
Add activerecord-import as dependency for batch processing
aitbw Jan 23, 2020
01c86df
Refactor ModeratedTexts::Import class to use batch insert
aitbw Jan 23, 2020
392728f
Show all offenses detected for a comment on AutoModeratedContent#index
aitbw Jan 29, 2020
7442668
Add tag to offensive comments under Users#show
aitbw Jan 29, 2020
c81a3b3
Do not fetch offensive comments by default
aitbw Jan 29, 2020
f8c7abd
Render alert after creating a comment that contains offensive words
aitbw Jan 29, 2020
2152064
Define algorithm to filter moderated words
aitbw Jan 29, 2020
788bbce
Consider I18n keys for ModeratedTexts submit buttons used
aitbw Jan 30, 2020
e9f5c32
Add column for number of detected occurrences for moderated words
aitbw Jan 30, 2020
7b5578d
Use filter_subnav to filter auto moderated content
aitbw Jan 31, 2020
982f993
Consider I18n keys under Auto Moderated Content panel used
aitbw Jan 31, 2020
81a0cfd
Remove unnecessary variable usage
aitbw Jan 31, 2020
fe61a20
[WIP] Use #destroy_all method when deleting a moderated word
aitbw Jan 31, 2020
4060845
Remove unnecessary usage of #filtered scope
aitbw Feb 4, 2020
51a73c0
Retrieve comments that contain offensive words
aitbw Feb 4, 2020
d52f34d
Allow admins to dismiss non-offensive comments caught by algorithm
aitbw Feb 4, 2020
62d02a1
Allow admins to confirm offensive comments caught by algorithm
aitbw Feb 4, 2020
0d0a95c
Filter offensive comments from legislation annotations
aitbw Feb 6, 2020
27506cb
Add specs for auto moderated content
aitbw Feb 6, 2020
b1505a3
Use #update_all when approving/discard auto-moderated comments
aitbw Feb 6, 2020
3509dbc
Do not render moderation buttons if comment is already moderated
aitbw Feb 6, 2020
47570f4
Improve rendering for 'moderated' tag under Users#show
aitbw Feb 7, 2020
50759b9
Simplify render when listing offensive words in comments
aitbw Feb 7, 2020
73cddfd
Use moderated content class as params to avoid hardcoding values
aitbw Feb 10, 2020
2862327
Do not allow editing moderated words if a offense is already registered
aitbw Feb 10, 2020
6c7c0d2
Fix failing specs for auto moderated content module
aitbw Feb 10, 2020
4aab68a
Add extra specs when creating non-offensive comments
aitbw Feb 10, 2020
aec1cc5
Improve coverage for moderated texts feature spec
aitbw Feb 11, 2020
5db121b
Improve readability for feature specs
aitbw Feb 11, 2020
9399dac
Add 'Edit' link for offensive, non-moderated comments
aitbw Feb 13, 2020
6c20243
Restrict offensive comment edition to author
aitbw Feb 13, 2020
8b6b287
Render edit form for offensive, non-moderated comments
aitbw Feb 13, 2020
7689843
Limit offensive comment edition to its authors
aitbw Feb 18, 2020
8df52b0
Convert offense checker regex to Comment class method
aitbw Feb 18, 2020
acd431d
Allow users to edit their offensive comments
aitbw Feb 18, 2020
77bde21
Fix #delete_all deprecation warning
aitbw Feb 18, 2020
18a22b4
Redirect to User comments path after editing an offensive comment
aitbw Feb 18, 2020
fcbacb5
Fix model relations between Comment, ModeratedContent and ModeratedText
aitbw Feb 19, 2020
0844d18
Build scaffold for confirmed/declined moderation emails
aitbw Feb 20, 2020
2e92a57
Send email to moderable author if moderation is declined/confirmed
aitbw Feb 20, 2020
dca0540
System emails scaffold for confirmed/declined moderations
aitbw Feb 20, 2020
d9f23c1
Handle redirection for success/failure when correcting offenses
aitbw Feb 24, 2020
36b47ec
Fix broken #filtered scope
aitbw Feb 25, 2020
1ddc1fd
Improve coverage for comment specs
aitbw Feb 25, 2020
7aad1ab
Add email specs for confirmed/declined moderation
aitbw Feb 25, 2020
59c56dc
Add specs for User#show when showing/editing offensive comments
aitbw Feb 25, 2020
0c291e4
Improve display errors in ModeratedTextsController
taitus Feb 27, 2020
913e781
Update notice texts
taitus Feb 27, 2020
49dc0a9
Minor refactor and renaming to clarify helper method
taitus Feb 27, 2020
f8ca46b
Refactor edit comment action
taitus Mar 2, 2020
24f97f5
Allow editing only of comments that have not yet been moderated
taitus Mar 2, 2020
ae43d93
Add notice after update comment
taitus Mar 2, 2020
a5de1ef
Improve tag styles and texts in the user show page
taitus Mar 2, 2020
e5281f6
Add specs for moderation emails
taitus Mar 3, 2020
ddcad69
Display filter "pending" as default in Moderated Content
taitus Mar 23, 2020
c86434c
Add paginatino to Moderated Content and Moderated Text pages
taitus Mar 23, 2020
63a4398
Remove Paranoia in ModeratedText
taitus Mar 23, 2020
b46105e
Allow access to user_path from moderated content index page
taitus Mar 23, 2020
d4bd469
Allow access to My Content section from auto moderated message
taitus Mar 23, 2020
4042c77
Allow send two times same or similar csv without uniqueness errors.
taitus Mar 23, 2020
be1d6eb
Improve locales
taitus Mar 24, 2020
9e18ee7
Disble cache when update a comment with ofenses.
taitus Mar 24, 2020
8643a5d
Display declined_at/confirmed_at related with a moderated_content
taitus May 8, 2020
60e72e4
Ask for confirmation when we confirm or decline a comment
taitus May 8, 2020
c4805c6
Render the comment source in auto moderated content index page
taitus May 8, 2020
84af47e
Improve locales
taitus May 8, 2020
c52b5ac
Update travis configuration for old bundler version
taitus Aug 21, 2020
fa6bd1e
Maintain consistency between the comment counter and the comments dis…
taitus Aug 28, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
41 changes: 41 additions & 0 deletions .coffeelint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"arrow_spacing": {
"level": "error"
},
"braces_spacing": {
"level": "error",
"spaces": 1
},
"colon_assignment_spacing": {
"level": "error",
"spacing": {
"left": 0,
"right": 1
}
},
"eol_last": {
"level": "error"
},
"indentation": {
"value": 2
},
"line_endings": {
"level": "error"
},
"max_line_length": {
"value": 100,
"level": "error",
"limitComments": true
},
"no_trailing_whitespace": {
"level": "error",
"allowed_in_comments": false,
"allowed_in_empty_lines": false
},
"space_operators": {
"level": "error"
},
"spacing_after_comma": {
"level": "error"
}
}
14 changes: 14 additions & 0 deletions .erb-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
linters:
FinalNewline:
enabled: true
SpaceAroundErbTag:
enabled: true
SelfClosingTag:
enabled: false
Rubocop:
enabled: true
only:
- Layout/EndOfLine
- Lint/LiteralAsCondition
- Style/PercentLiteralDelimiters
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/flakies.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Tests that fail randomly are called "flakies", this one seems to be one:
# How
- [ ] Explain why the test is flaky, or under which conditions/scenario it fails randomly
- [ ] Explain why your PR fixes it
- [ ] Create a backport PR to consul/consul when the fixing PR is approved

## Tips for flaky hunting

Expand Down
34 changes: 17 additions & 17 deletions .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
References
===================
> Add references to related Issues/Pull Requests/Travis Builds/Rollbar errors/etc...

Objectives
===================
> What are the objectives of this changes? (If there is no related Issue with an explanation)

Visual Changes
===================
> Any visual changes? please attach screenshots (or gifs) showing them.
> If modified views are public (not the admin panel), try them in mobile display (with your browser's developer console) and add screenshots.

Notes
===================
> Mention rake tasks or actions to be done when deploying this changes to a server (if any).
> Explain any caveats, or important things to notice like deprecations (if any).
## References

> Related Issues/Pull Requests/Travis Builds/Rollbar errors/etc...

## Objectives

> What are the objectives of this changes?

## Visual Changes

> A picture is worth a thousand words!

## Does this PR need a Backport to CONSUL?

> Don't forget to add the label `Backport-Needed`

## Notes
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@

# Mac finder artifacts
.DS_Store

# Intellij IDE project settings
/.idea

.ruby-gemset

public/sitemap.xml
public/system/
/public/ckeditor_assets/
9 changes: 9 additions & 0 deletions .hound.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
rubocop:
config_file: .rubocop.yml
scss:
config_file: .scss-lint.yml
coffeescript:
config_file: .coffeelint.json
erblint:
enabled: true
config_file: .erb-lint.yml
36 changes: 4 additions & 32 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,4 @@
inherit_from: .rubocop_todo.yml
require: rubocop-rspec

AllCops:
DisplayCopNames: true
DisplayStyleGuide: true
Include:
- '**/Rakefile'
- '**/config.ru'
Exclude:
- 'db/**/*'
- 'config/**/*'
- 'script/**/*'
TargetRubyVersion: 2.3
# RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
# to ignore them, so only the ones explicitly set in this file are enabled.
DisabledByDefault: true

Metrics/LineLength:
Max: 100

Layout/IndentationConsistency:
EnforcedStyle: rails

Layout/EndOfLine:
EnforcedStyle: lf
inherit_from: .rubocop_basic.yml

Bundler/DuplicatedGem:
Enabled: true
Expand Down Expand Up @@ -274,9 +249,6 @@ RSpec/DescribeMethod:
RSpec/DescribeSymbol:
Enabled: true

RSpec/DescribedClass:
Enabled: true

RSpec/EmptyExampleGroup:
Enabled: true

Expand Down Expand Up @@ -361,9 +333,6 @@ RSpec/NestedGroups:
Enabled: true
Max: 4

RSpec/NotToNot:
Enabled: true

RSpec/OverwritingSetup:
Enabled: true

Expand Down Expand Up @@ -420,3 +389,6 @@ Security/MarshalLoad:

Security/YAMLLoad:
Enabled: true

Style/PercentLiteralDelimiters:
Enabled: true
45 changes: 45 additions & 0 deletions .rubocop_basic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
require: rubocop-rspec

AllCops:
DisplayCopNames: true
DisplayStyleGuide: true
Include:
- "**/Rakefile"
- "**/config.ru"
Exclude:
- "db/migrate/**/*"
- "db/schema.rb"
TargetRubyVersion: 2.3
# RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
# to ignore them, so only the ones explicitly set in this file are enabled.
DisabledByDefault: true

Layout/IndentationConsistency:
EnforcedStyle: rails

Layout/IndentationWidth:
Enabled: true

Layout/EndOfLine:
EnforcedStyle: lf

Layout/TrailingBlankLines:
Enabled: true

Layout/TrailingWhitespace:
Enabled: true

Lint/LiteralAsCondition:
Enabled: true

Lint/UselessAssignment:
Enabled: true

Metrics/LineLength:
Max: 110

RSpec/NotToNot:
Enabled: true

Style/StringLiterals:
EnforcedStyle: double_quotes
71 changes: 0 additions & 71 deletions .rubocop_todo.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .scss-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ linters:

StringQuotes:
enabled: true
style: single_quotes
style: double_quotes

TrailingSemicolon:
enabled: true
Expand Down
18 changes: 15 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
language: ruby
addons:
postgresql: '9.4'
postgresql: "9.4"
chrome: stable
rvm:
- 2.3.2
cache: bundler
bundler_args: --without development
before_install:
- gem install bundler:1.17.1
before_script:
- wget -N https://chromedriver.storage.googleapis.com/2.36/chromedriver_linux64.zip -P ~/
- unzip ~/chromedriver_linux64.zip -d ~/
Expand All @@ -22,12 +24,22 @@ env:
global:
- KNAPSACK_PRO_FIXED_QUEUE_SPLIT=true
- KNAPSACK_PRO_LOG_LEVEL=info
- KNAPSACK_PRO_CI_NODE_TOTAL=2
- KNAPSACK_PRO_CI_NODE_TOTAL=10
- secure: KTKnEVkT28dxldpq7CBCF2Vd0AiQFDgwsVMhq82vw+CTJibQKnOSts+x7azcXWfCnTTklybmocUowb/NWV4vpo3tyAZrZfnO8nzK/Ztu/Ki2x2ranLRxSXvuNkyF5z1E3xeGL/XOcKN8b/CAR1ZPE2OsEko8S/qSY/Y4dPjMH+bFEpEqBvkTpn5Ze4uW7IsmGsEUsElk9fDZPuDElNiVhMAYL8/cpEI/EucSqYrGqu0ulHHeUICG1bkoCQziCrvU+LdFQRh5OXyhSO5/OmYJwjcNuI/jS97VK50GFyxlssTJHChiTSWhT/8afM5pM/uu/cDJKDL0zDmAce+Fy/xSjFCby4jN7vscNpbZ6lGyIW2uqBFX/Ri4jZVyzu9qgwEeKhsrsfsfSMEjx9JMvUiuyAn15SFrN8+bzztU2GVbYd189L8hEa/8T899zE8z80oyRs8Keq+qVgk4MwfvAz3dHh7Z2/OKS2d6Vru0nZLGT11ucm4X1JnuRAe4pDAsJ5kvXKRr3qeF2qRoVOtrEqJHjY30Ipx6mGJfbMmxEQQgWGnHHS8ogRiXG4vIXvyqzlnsTJTUxu7ASuBWxVBAgZalxD1kcyF2ZZ3jCzXSJphPQGiZNDzHgZeR7AwK61c9uwqEB/XoswoXZO5RlMiIVZIGp/tZDkDcHlrPmFdMgxboP8Y=
- secure: G/lHi3kzYucmNDGTvQmzUM4OPiokHLX8lOSFoZXGIq5bCG77dT5bYi6WRc7+wimozrdQxAGEgX++c8yxJcxNU7JzhpRwNukQ7ic0pwSwHDdRjFwSLznlJOmoSxiBGjy+C/O3XRHN/8SaU7trcUp7nGQiIZIp4LyHFw6REA0o+ZrDoQ/EjmnraF0udJcR/t8Y3MvxlWjausUxjbciaf8xQi9HlBUWnJpNg5HeUAG2aSejlya1/PQhBRN8KcqCsKphK9D39ulOQOmWPdsE4RkG3e3l3670e5Nw4s4coGzOxfVPo6EK6iJ/XREhGbJ6F/YpfseybJICA/m0KUAIGhmvcUuEOE/fM0hUMjbueA1lZDD7pstnvu+EUH2fuIBOAltg9KaSgrIy5Hpbf7j0gQobDWRvl5VA/OIBMT3MOZq/FXeugqM3MM6Ub4djdvpVt2DzY9ckPPUBHM4uPcDhuk0rQFdpC6DeKYyyGizELCpll892I6vmXece4uTcCtPLVGdNmMNfTVDWHKWX0lAfarVVEmvzmhj04YJ62bPsuWtOBJNRzZ9UA3pRAj/XCXAP2BGAC0nBfIg2S7NjTaF7WAZZ6FPncB8ubMhMd2AiAQTIZq8PF+fLRN+aPWDqpTDieK1wwzN2klZBJ5STexZ3XwdqOuVp330NWbfiGGNW3DiBcC0=
matrix:
- KNAPSACK_PRO_CI_NODE_INDEX=0
- KNAPSACK_PRO_CI_NODE_INDEX=1
- KNAPSACK_PRO_CI_NODE_INDEX=2
- KNAPSACK_PRO_CI_NODE_INDEX=3
- KNAPSACK_PRO_CI_NODE_INDEX=4
- KNAPSACK_PRO_CI_NODE_INDEX=5
- KNAPSACK_PRO_CI_NODE_INDEX=6
- KNAPSACK_PRO_CI_NODE_INDEX=7
- KNAPSACK_PRO_CI_NODE_INDEX=8
- KNAPSACK_PRO_CI_NODE_INDEX=9
notifications:
slack:
secure: 18E9SU0SR/9knRvCMYwVqFCqVTBT6qJtZQ/gadpheqUPPlcLoQfnlIzJkLIYqkE0sn1nkBE5Bt2I90FU53p0NkrTEmSGlQXcN1vEXM8EXMaoVf3NBsIJeleMwt9VTojzo81EgIi6x7q3fDiFORJ4rqOGd9XkeLn5yrAtIkdaenVs0bhS5s24FP76hKqO37IFLG2v3EEqxg5k31oW6yhyP35Mxns+AGbfaZbxEy4XbCoU65KFuYhBsVZ/y1evOl/wcre2fCAoT2uKeqUWGEcDzH7oSCz7vfk7iO9BZnO++v7oj8mr/nrZL1KMFt77eqtdT51XQoJcchgJC/R9km5hRGkQqFCHhqPcBxo5c3p+jauL0kLaqTggeLDv2FQ2huJ8FSJ4ADac+n3g7wT7BX7HJlCvK0nbooY1JtBlk7+6/pw6ksSFIOo0FHg5gXN9IlG1tQQuENzzsXULNc6s4nPeT+n78uOp1b0N/Gn06moEBaKgXqqx1yV1XeJ02X8n3uDZxPuX3n2bJ4DMIrBjeWApxHAgyOraOzQHNQgJoj4tHlWutF33ApV2tcIMefIzvjM4tIYwIkpfGgohGaTf8eU5X9pqiMgwlDpJHVBsSvpk/Z/Nj7evYznjBiDYqOcXoztsqHrS0C91MaT+eExDfd9HDmThsE07RT7zcP9aElFZA/k=
secure: xBUwrdF9rjPOQt50o/aqZdY5QoNLoqEego+TKAwiK98fRipP3UVT3V/dSdK02+rV5nC4qGPF0uAgXlMn9OhHn2Fc/KWJ3UYcnvOp0szK4yrAzbp4weIcf/gU5hT3655YVxa5uQXXLQn/rJXPSKvhGJmYsP5ufpTRjSs3eV8t56vkyvbcavAbUq46nj+A+44XLbpNbxgApiaOR/WetrZFiLk6QTf6wmMkIKifi2NTiV/4wOAVAwPGAa5BFW+aoykHQf2hOVVTkf6QrKLKa9gYkWeX1FaCW4ZTC1ghOB5HwfEraUWvcovPoqOWMt39lHrEcc7qrPbolJltYG6CJTT8QK3CU+rD3lOxFhCfOzqrmJHUC/MGH35d4DIA8ZPk0mNXHcHv3vwZaNs0l0rBzascU8lI8BOWlBjR2rul9I7/CI7JfbTmkx0LqSybXviN104dcEkRFoB+FuyZasUYX19tD8/YtrFf8v/5zt8L6i/2Sicb/Ym1nBRt6rIFtxZdn6aWQeZbYkEUn2kEIfjy+CIkZTMCXfFAYaj5GxB/xac4kh72JERTtVYdOsON/o4Gzl2SsYvaI1esxVWBszq8JVS3Fx3j1mqW/O+OBfPXVd7MZSI1NOkAFr7n6HH2cvftM8OA8p2320QQcqqmfDOoqbPb8A/ZNtnXOQ4Ym14b94sdeMo=
on_failure: always
on_success: change
Loading