summaryrefslogtreecommitdiff
path: root/.ruby-version
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-08-11 20:30:14 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-08-11 20:30:14 +0800
commit3b0dcbf235c7705879345e96fe215b6a7f362d92 (patch)
tree0c1c029ea2ce970d48199341a92867a8d59602ce /.ruby-version
parent34741e932742c426896955f357f6b406bfd1d6f2 (diff)
parentc62ae6cfd70d518386fdbcb9714d18ac4f5e8c31 (diff)
downloadgitlab-ce-3b0dcbf235c7705879345e96fe215b6a7f362d92.tar.gz
Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-better
* upstream/master: Fix merge request diff deserialisation when too_large was absent Bumps omniauth-ldap gem version to 2.0.4 Remove an unnecessary `let` in spec/features/projects/user_edits_files_spec.rb Remove documentation about rules that are now enforced by RuboCop Enable the RSpec/HookArgument cop and auto-correct offenses
Diffstat (limited to '.ruby-version')
0 files changed, 0 insertions, 0 deletions