nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Dennis Schubert 2017-05-21 12:05:22 +02:00
commit 010c1953f9
No known key found for this signature in database
GPG key ID: 5A0304BEA7966D7E
3 changed files with 49 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.rubocop.yml
View file

@ -164,6 +164,16 @@ Lint/Debugger:
Style/NumericPredicate: Style/NumericPredicate:
EnforcedStyle: comparison EnforcedStyle: comparison
# Old defaults from rubocop < 0.48.1
Style/PercentLiteralDelimiters:
PreferredDelimiters:
default: '()'
'%i': '()'
'%I': '()'
'%r': '{}'
'%w': '()'
'%W': '()'
# Reset some HoundCI changes back to Rubocop defaults # Reset some HoundCI changes back to Rubocop defaults
Style/DotPosition: Style/DotPosition:
EnforcedStyle: leading EnforcedStyle: leading

14
Gemfile
View file

@ -246,13 +246,13 @@ group :development do
gem "rb-inotify", "0.9.8", require: false gem "rb-inotify", "0.9.8", require: false
# Linters # Linters
gem "haml_lint", "0.21.0" gem "haml_lint", "0.24.0", require: false
gem "pronto", "0.8.2" gem "pronto", "0.9.3", require: false
gem "pronto-eslint", "0.8.0" gem "pronto-eslint", "0.9.1", require: false
gem "pronto-haml", "0.8.0" gem "pronto-haml", "0.9.0", require: false
gem "pronto-rubocop", "0.8.0" gem "pronto-rubocop", "0.9.0", require: false
gem "pronto-scss", "0.8.0", require: false gem "pronto-scss", "0.9.1", require: false
gem "rubocop", "0.47.1" gem "rubocop", "0.48.1", require: false
# Preloading environment # Preloading environment

63
Gemfile.lock
View file

@ -235,9 +235,9 @@ GEM
ruby-progressbar (~> 1.4) ruby-progressbar (~> 1.4)
get_process_mem (0.2.1) get_process_mem (0.2.1)
gherkin (4.0.0) gherkin (4.0.0)
gitlab (3.7.0) gitlab (4.0.0)
httparty (~> 0.13.0) httparty
terminal-table terminal-table (= 1.7.1)
globalid (0.3.7) globalid (0.3.7)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
gon (6.1.0) gon (6.1.0)
@ -268,8 +268,9 @@ GEM
rubocop (~> 0.20) rubocop (~> 0.20)
haml (4.0.7) haml (4.0.7)
tilt tilt
haml_lint (0.21.0) haml_lint (0.24.0)
haml (~> 4.0) haml (>= 4.0, < 5.1)
rainbow
rake (>= 10, < 13) rake (>= 10, < 13)
rubocop (>= 0.47.0) rubocop (>= 0.47.0)
sysexits (~> 1.1) sysexits (~> 1.1)
@ -296,8 +297,7 @@ GEM
http-form_data (1.0.1) http-form_data (1.0.1)
http_accept_language (2.1.0) http_accept_language (2.1.0)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
httparty (0.13.7) httparty (0.14.0)
json (~> 1.8)
multi_xml (>= 0.5.2) multi_xml (>= 0.5.2)
httpclient (2.8.3) httpclient (2.8.3)
i18n (0.8.1) i18n (0.8.1)
@ -391,7 +391,7 @@ GEM
multi_json (~> 1.3) multi_json (~> 1.3)
multi_xml (~> 0.5) multi_xml (~> 0.5)
rack (>= 1.2, < 3) rack (>= 1.2, < 3)
octokit (4.6.2) octokit (4.7.0)
sawyer (~> 0.8.0, >= 0.5.3) sawyer (~> 0.8.0, >= 0.5.3)
omniauth (1.4.2) omniauth (1.4.2)
hashie (>= 1.2, < 4) hashie (>= 1.2, < 4)
@ -436,24 +436,24 @@ GEM
cliver (~> 0.3.1) cliver (~> 0.3.1)
websocket-driver (>= 0.2.0) websocket-driver (>= 0.2.0)
powerpack (0.1.1) powerpack (0.1.1)
pronto (0.8.2) pronto (0.9.3)
gitlab (~> 3.6, >= 3.4.0) gitlab (~> 4.0, >= 4.0.0)
httparty (>= 0.13.7, < 0.15) httparty (>= 0.13.7, < 0.15)
octokit (~> 4.3, >= 4.1.0) octokit (~> 4.7, >= 4.7.0)
rainbow (~> 2.1) rainbow (~> 2.1)
rugged (~> 0.24, >= 0.23.0) rugged (~> 0.24, >= 0.23.0)
thor (~> 0.19.0) thor (~> 0.19.0)
pronto-eslint (0.8.0) pronto-eslint (0.9.1)
eslintrb (~> 2.0, >= 2.0.0) eslintrb (~> 2.0, >= 2.0.0)
pronto (~> 0.8.0) pronto (~> 0.9.0)
pronto-haml (0.8.0) pronto-haml (0.9.0)
haml_lint (~> 0.16, >= 0.15.0) haml_lint (~> 0.23)
pronto (~> 0.8.0) pronto (~> 0.9.0)
pronto-rubocop (0.8.0) pronto-rubocop (0.9.0)
pronto (~> 0.8.0) pronto (~> 0.9.0)
rubocop (~> 0.38, >= 0.35.0) rubocop (~> 0.38, >= 0.35.0)
pronto-scss (0.8.0) pronto-scss (0.9.1)
pronto (~> 0.8.0) pronto (~> 0.9.0)
scss_lint (~> 0.43, >= 0.43.0) scss_lint (~> 0.43, >= 0.43.0)
pry (0.10.4) pry (0.10.4)
coderay (~> 1.1.0) coderay (~> 1.1.0)
@ -560,7 +560,8 @@ GEM
activesupport (= 4.2.8) activesupport (= 4.2.8)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rainbow (2.2.1) rainbow (2.2.2)
rake
raindrops (0.17.0) raindrops (0.17.0)
rake (12.0.0) rake (12.0.0)
rb-fsevent (0.9.8) rb-fsevent (0.9.8)
@ -594,7 +595,7 @@ GEM
rspec-mocks (~> 3.5.0) rspec-mocks (~> 3.5.0)
rspec-support (~> 3.5.0) rspec-support (~> 3.5.0)
rspec-support (3.5.0) rspec-support (3.5.0)
rubocop (0.47.1) rubocop (0.48.1)
parser (>= 2.3.3.1, < 3.0) parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1) powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0) rainbow (>= 1.99.1, < 3.0)
@ -618,7 +619,7 @@ GEM
sawyer (0.8.1) sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6) addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0) faraday (~> 0.8, < 1.0)
scss_lint (0.52.0) scss_lint (0.53.0)
rake (>= 0.9, < 13) rake (>= 0.9, < 13)
sass (~> 3.4.20) sass (~> 3.4.20)
secure_headers (3.6.1) secure_headers (3.6.1)
@ -677,7 +678,7 @@ GEM
temple (0.8.0) temple (0.8.0)
term-ansicolor (1.4.0) term-ansicolor (1.4.0)
tins (~> 1.0) tins (~> 1.0)
terminal-table (1.7.3) terminal-table (1.7.1)
unicode-display_width (~> 1.1.1) unicode-display_width (~> 1.1.1)
test_after_commit (1.1.0) test_after_commit (1.1.0)
activerecord (>= 3.2) activerecord (>= 3.2)
@ -790,7 +791,7 @@ DEPENDENCIES
guard-cucumber (= 2.1.2) guard-cucumber (= 2.1.2)
guard-rspec (= 4.7.3) guard-rspec (= 4.7.3)
guard-rubocop (= 1.2.0) guard-rubocop (= 1.2.0)
haml_lint (= 0.21.0) haml_lint (= 0.24.0)
hamlit (= 2.8.0) hamlit (= 2.8.0)
handlebars_assets (= 0.23.1) handlebars_assets (= 0.23.1)
http_accept_language (= 2.1.0) http_accept_language (= 2.1.0)
@ -820,11 +821,11 @@ DEPENDENCIES
openid_connect (= 0.12.0) openid_connect (= 0.12.0)
pg (= 0.19.0) pg (= 0.19.0)
poltergeist (= 1.13.0) poltergeist (= 1.13.0)
pronto (= 0.8.2) pronto (= 0.9.3)
pronto-eslint (= 0.8.0) pronto-eslint (= 0.9.1)
pronto-haml (= 0.8.0) pronto-haml (= 0.9.0)
pronto-rubocop (= 0.8.0) pronto-rubocop (= 0.9.0)
pronto-scss (= 0.8.0) pronto-scss (= 0.9.1)
pry pry
pry-byebug pry-byebug
quiet_assets (= 1.1.0) quiet_assets (= 1.1.0)
@ -861,7 +862,7 @@ DEPENDENCIES
redcarpet (= 3.4.0) redcarpet (= 3.4.0)
responders (= 2.3.0) responders (= 2.3.0)
rspec-rails (= 3.5.2) rspec-rails (= 3.5.2)
rubocop (= 0.47.1) rubocop (= 0.48.1)
ruby-oembed (= 0.10.1) ruby-oembed (= 0.10.1)
rubyzip (= 1.2.1) rubyzip (= 1.2.1)
sass-rails (= 5.0.6) sass-rails (= 5.0.6)