diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-03-24 10:20:21 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-24 10:20:21 +0000 |
| commit | ffe5ac41b84c342a8b1d099afe116cb1522da8f2 (patch) | |
| tree | fe21b6a9416b5845dabac1a78d9022a3e6816e24 /lib | |
| parent | 4a4a79aa9eb190c44d73dc44f22c88ec5613ac58 (diff) | |
| parent | 2824972c36dae83e630c0c2067a6c21b93ef7d1f (diff) | |
| download | gitlab-ce-ffe5ac41b84c342a8b1d099afe116cb1522da8f2.tar.gz | |
Merge branch 'fix-frontend-specs' into 'master'
Fix specs broken by !3270 and !3337.
To be fair:
- !3270 modifies CSS but `scss-lint` job was allowed to fail in the MR, while not allowed in `master`
- !3337 modifies HTML but the broken test was only in `master` at the time
/cc @alfredo1 @iamphill
See merge request !3378
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions