Merge branch 'rs-bump-brakeman' into 'master'
Bump brakeman to ~> 3.1.0 See merge request !2219
This commit is contained in:
commit
19054ba32b
2
Gemfile
2
Gemfile
|
@ -214,7 +214,7 @@ gem 'net-ssh', '~> 3.0.1'
|
||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
gem "foreman"
|
gem "foreman"
|
||||||
gem 'brakeman', '3.0.1', require: false
|
gem 'brakeman', '~> 3.1.0', require: false
|
||||||
|
|
||||||
gem "annotate", "~> 2.6.0"
|
gem "annotate", "~> 2.6.0"
|
||||||
gem "letter_opener", '~> 1.1.2'
|
gem "letter_opener", '~> 1.1.2'
|
||||||
|
|
22
Gemfile.lock
22
Gemfile.lock
|
@ -84,15 +84,17 @@ GEM
|
||||||
bootstrap-sass (3.3.5)
|
bootstrap-sass (3.3.5)
|
||||||
autoprefixer-rails (>= 5.0.0.1)
|
autoprefixer-rails (>= 5.0.0.1)
|
||||||
sass (>= 3.2.19)
|
sass (>= 3.2.19)
|
||||||
brakeman (3.0.1)
|
brakeman (3.1.4)
|
||||||
erubis (~> 2.6)
|
erubis (~> 2.6)
|
||||||
fastercsv (~> 1.5)
|
fastercsv (~> 1.5)
|
||||||
haml (>= 3.0, < 5.0)
|
haml (>= 3.0, < 5.0)
|
||||||
highline (~> 1.6.20)
|
highline (>= 1.6.20, < 2.0)
|
||||||
multi_json (~> 1.2)
|
multi_json (~> 1.2)
|
||||||
ruby2ruby (~> 2.1.1)
|
ruby2ruby (>= 2.1.1, < 2.3.0)
|
||||||
ruby_parser (~> 3.5.0)
|
ruby_parser (~> 3.7.0)
|
||||||
|
safe_yaml (>= 1.0)
|
||||||
sass (~> 3.0)
|
sass (~> 3.0)
|
||||||
|
slim (>= 1.3.6, < 4.0)
|
||||||
terminal-table (~> 1.4)
|
terminal-table (~> 1.4)
|
||||||
browser (1.0.1)
|
browser (1.0.1)
|
||||||
builder (3.2.2)
|
builder (3.2.2)
|
||||||
|
@ -347,7 +349,7 @@ GEM
|
||||||
html2haml (>= 1.0.1)
|
html2haml (>= 1.0.1)
|
||||||
railties (>= 4.0.1)
|
railties (>= 4.0.1)
|
||||||
hashie (3.4.3)
|
hashie (3.4.3)
|
||||||
highline (1.6.21)
|
highline (1.7.8)
|
||||||
hike (1.2.3)
|
hike (1.2.3)
|
||||||
hipchat (1.5.2)
|
hipchat (1.5.2)
|
||||||
httparty
|
httparty
|
||||||
|
@ -636,10 +638,10 @@ GEM
|
||||||
ruby-saml (1.0.0)
|
ruby-saml (1.0.0)
|
||||||
nokogiri (>= 1.5.10)
|
nokogiri (>= 1.5.10)
|
||||||
uuid (~> 2.3)
|
uuid (~> 2.3)
|
||||||
ruby2ruby (2.1.4)
|
ruby2ruby (2.2.0)
|
||||||
ruby_parser (~> 3.1)
|
ruby_parser (~> 3.1)
|
||||||
sexp_processor (~> 4.0)
|
sexp_processor (~> 4.0)
|
||||||
ruby_parser (3.5.0)
|
ruby_parser (3.7.2)
|
||||||
sexp_processor (~> 4.1)
|
sexp_processor (~> 4.1)
|
||||||
rubyntlm (0.5.2)
|
rubyntlm (0.5.2)
|
||||||
rubypants (0.2.0)
|
rubypants (0.2.0)
|
||||||
|
@ -693,6 +695,9 @@ GEM
|
||||||
tilt (>= 1.3, < 3)
|
tilt (>= 1.3, < 3)
|
||||||
six (0.2.0)
|
six (0.2.0)
|
||||||
slack-notifier (1.2.1)
|
slack-notifier (1.2.1)
|
||||||
|
slim (3.0.6)
|
||||||
|
temple (~> 0.7.3)
|
||||||
|
tilt (>= 1.3.3, < 2.1)
|
||||||
slop (3.6.0)
|
slop (3.6.0)
|
||||||
spinach (0.8.10)
|
spinach (0.8.10)
|
||||||
colorize
|
colorize
|
||||||
|
@ -734,6 +739,7 @@ GEM
|
||||||
railties (>= 3.2.5, < 5)
|
railties (>= 3.2.5, < 5)
|
||||||
teaspoon-jasmine (2.2.0)
|
teaspoon-jasmine (2.2.0)
|
||||||
teaspoon (>= 1.0.0)
|
teaspoon (>= 1.0.0)
|
||||||
|
temple (0.7.6)
|
||||||
term-ansicolor (1.3.2)
|
term-ansicolor (1.3.2)
|
||||||
tins (~> 1.0)
|
tins (~> 1.0)
|
||||||
terminal-table (1.5.2)
|
terminal-table (1.5.2)
|
||||||
|
@ -830,7 +836,7 @@ DEPENDENCIES
|
||||||
better_errors (~> 1.0.1)
|
better_errors (~> 1.0.1)
|
||||||
binding_of_caller (~> 0.7.2)
|
binding_of_caller (~> 0.7.2)
|
||||||
bootstrap-sass (~> 3.0)
|
bootstrap-sass (~> 3.0)
|
||||||
brakeman (= 3.0.1)
|
brakeman (~> 3.1.0)
|
||||||
browser (~> 1.0.0)
|
browser (~> 1.0.0)
|
||||||
bullet
|
bullet
|
||||||
bundler-audit
|
bundler-audit
|
||||||
|
|
|
@ -9,7 +9,7 @@ class Projects::CommitsController < Projects::ApplicationController
|
||||||
|
|
||||||
def show
|
def show
|
||||||
@repo = @project.repository
|
@repo = @project.repository
|
||||||
@limit, @offset = (params[:limit] || 40), (params[:offset] || 0)
|
@limit, @offset = (params[:limit] || 40).to_i, (params[:offset] || 0).to_i
|
||||||
|
|
||||||
@commits = @repo.commits(@ref, @path, @limit, @offset)
|
@commits = @repo.commits(@ref, @path, @limit, @offset)
|
||||||
@note_counts = project.notes.where(commit_id: @commits.map(&:id)).
|
@note_counts = project.notes.where(commit_id: @commits.map(&:id)).
|
||||||
|
|
Loading…
Reference in New Issue