diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-08-10 11:12:22 +0100 | 
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-08-10 11:12:22 +0100 | 
| commit | fbf241e8aede13836aaead0a7f19ab1ff219033e (patch) | |
| tree | 5885c6ad3afdac9b76236bfaa5027b12f0bd203f /lib/ci/ansi2html.rb | |
| parent | 16b15a11761ca93377f536a744f21fcd19fc78bf (diff) | |
| parent | 188181b780c5c0e5b05339daddad9c25c3b1bf85 (diff) | |
| download | gitlab-ce-fbf241e8aede13836aaead0a7f19ab1ff219033e.tar.gz | |
Merge branch 'master' into issue-discussions-refactor
* master: (42 commits)
  alternative route for download archive
  Add missing command to compile GetText files
  Prevent user from changing username with container registry tags
  Rename RPC 'Exists' to 'RepositoryExists'
  Fix the sticky changes bar on commits page
  Fix ee_compat_check when EE branch uses a prefix
  Removed display styles when hiding the fly out navigation
  Explain why we use select all for project_url_constrainer.rb
  Fix pikaday being undefined
  Add a helper to stub storage settings with defaults
  Enable the Layout/SpaceBeforeBlockBraces cop
  update Install from Source instructions
  Translations can be picked without asking for exceptions
  Ask for exceptions in advance
  Don't require stackprof in Gemfile
  Synchronous Korean translation in zanata
  Use full path of user's avatar in webhooks
  Update icon color on hover
  Align all nav items in sidebar
  Fix height of collapsed sidebar items
  ...
Diffstat (limited to 'lib/ci/ansi2html.rb')
| -rw-r--r-- | lib/ci/ansi2html.rb | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/lib/ci/ansi2html.rb b/lib/ci/ansi2html.rb index 55402101e43..8354fc8d595 100644 --- a/lib/ci/ansi2html.rb +++ b/lib/ci/ansi2html.rb @@ -254,7 +254,7 @@ module Ci        def state          state = STATE_PARAMS.inject({}) do |h, param| -          h[param] = send(param) +          h[param] = send(param) # rubocop:disable GitlabSecurity/PublicSend            h          end          Base64.urlsafe_encode64(state.to_json) @@ -266,7 +266,7 @@ module Ci          return if state[:offset].to_i > stream.size          STATE_PARAMS.each do |param| -          send("#{param}=".to_sym, state[param]) +          send("#{param}=".to_sym, state[param]) # rubocop:disable GitlabSecurity/PublicSend          end        end | 
