Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Milan
diaspora
Commits
fa24333c
Commit
fa24333c
authored
May 04, 2015
by
Jonne Haß
Committed by
Dennis Schubert
May 07, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bump rubocop
parent
5a6f6c68
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
11 deletions
+9
-11
.rubocop.yml
.rubocop.yml
+3
-5
Gemfile
Gemfile
+1
-1
Gemfile.lock
Gemfile.lock
+5
-5
No files found.
.rubocop.yml
View file @
fa24333c
...
...
@@ -36,10 +36,8 @@ Style/AlignHash:
EnforcedColonStyle
:
table
# Mixing the styles looks just silly.
# REVIEW: Enable once https://github.com/bbatsov/rubocop/commit/760ce1ed2cf10beda5e163f934c03a6fb6daa38e
# is released.
#Style/HashSyntax:
# EnforcedStyle: ruby19_no_mixed_keys
Style/HashSyntax
:
EnforcedStyle
:
ruby19_no_mixed_keys
# has_key? and has_value? are far more readable than key? and value?
Style/DeprecatedHashMethods
:
...
...
@@ -93,7 +91,7 @@ Style/SpaceInsideHashLiteralBraces:
# { ... } for multi-line blocks is okay, follow Weirichs rule instead:
# https://web.archive.org/web/20140221124509/http://onestepback.org/index.cgi/Tech/Ruby/BraceVsDoEnd.rdoc
Style/Blocks
:
Style/Block
Delimiter
s
:
Enabled
:
false
# do / end blocks should be used for side effects,
...
...
Gemfile
View file @
fa24333c
...
...
@@ -227,7 +227,7 @@ group :development do
# Linters
gem
"
jshintrb
"
,
"0.3.0"
gem
"
rubocop
"
,
"0.
29.1
"
gem
"
rubocop
"
,
"0.
31.0
"
# Preloading environment
...
...
Gemfile.lock
View file @
fa24333c
...
...
@@ -447,10 +447,10 @@ GEM
faraday (~> 0.9.0)
nokogiri (~> 1.6)
orm_adapter (0.5.0)
parser (2.2.
0.3
)
parser (2.2.
2.2
)
ast (>= 1.1, < 3.0)
phantomjs (1.9.8.0)
powerpack (0.1.
0
)
powerpack (0.1.
1
)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
...
...
@@ -601,9 +601,9 @@ GEM
rspec-mocks (~> 3.2.0)
rspec-support (~> 3.2.0)
rspec-support (3.2.2)
rubocop (0.
29.1
)
rubocop (0.
31.0
)
astrolabe (~> 1.3)
parser (>= 2.2.
0
.1, < 3.0)
parser (>= 2.2.
2
.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4)
...
...
@@ -808,7 +808,7 @@ DEPENDENCIES
roxml (= 3.1.6)
rspec-instafail (= 0.2.6)
rspec-rails (= 3.2.1)
rubocop (= 0.
29.1
)
rubocop (= 0.
31.0
)
ruby-oembed (= 0.8.14)
sass-rails (= 5.0.1)
selenium-webdriver (= 2.45.0)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment