diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-18 22:45:48 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-10-18 22:45:48 +0100 |
commit | 5c5d1c593c60ceb45bbd01e2a3bcb877507d41d9 (patch) | |
tree | 904f7ffdae6ac6265a77a3f4481e84d5bc297e35 /spec/helpers/diff_helper_spec.rb | |
parent | 99fdf660d35219d476629e6e83d935677f046949 (diff) | |
parent | 00c15cc27c33dd387069fce5777beb29d01f55ac (diff) | |
download | gitlab-ce-38869-dropzone-input.tar.gz |
Merge branch 'master' into 38869-dropzone-input38869-dropzone-input
* master:
Prevent ApplicationHelper specs from polluting later ones
Improve the gitlab:dev:ee_compat_check task to pass a repo URL without credentials
Fix tooltip padding to align to 8px grid
Decreases z-index of select2 to a lower number of our navigation bar
Diffstat (limited to 'spec/helpers/diff_helper_spec.rb')
0 files changed, 0 insertions, 0 deletions