diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-05-09 15:36:39 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-05-09 15:36:39 +0100 |
| commit | 5bc98d631b96ae0bb1725e2af4dc25c8459d57da (patch) | |
| tree | 7d560ed1902c6f0fef39d9715f00727105521794 /config/application.rb | |
| parent | 75964d4ea2d754db1763f1d93968ea2eb7ef77f8 (diff) | |
| parent | f59a44dbdf616d29e0185090a1401a6706aef33f (diff) | |
| download | gitlab-ce-5bc98d631b96ae0bb1725e2af4dc25c8459d57da.tar.gz | |
Merge branch 'master' into 30286-vue-loadin-icon
* master:
Prevent vue.esm.js from being bundled into the primary JS bundle
Robustify environment policy specs to pass on EE
Diffstat (limited to 'config/application.rb')
0 files changed, 0 insertions, 0 deletions