diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-20 17:34:04 +0100 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-20 17:51:07 +0100 |
commit | 6448368b5b71d9c93b865d2cad0206b475db4553 (patch) | |
tree | ac26a315400e40ceba27eb37cadef461f2d77e54 /app/assets/javascripts/users/index.js | |
parent | 115ffa3749300b58d7161610e27a41b844b3fb80 (diff) | |
parent | 7f78a78a36a4341680a71afa5a12a1f4d4876c66 (diff) | |
download | gitlab-ce-6448368b5b71d9c93b865d2cad0206b475db4553.tar.gz |
Merge remote-tracking branch 'origin/master' into ide
Diffstat (limited to 'app/assets/javascripts/users/index.js')
-rw-r--r-- | app/assets/javascripts/users/index.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/javascripts/users/index.js b/app/assets/javascripts/users/index.js new file mode 100644 index 00000000000..ecd8e09161e --- /dev/null +++ b/app/assets/javascripts/users/index.js @@ -0,0 +1,7 @@ +import ActivityCalendar from './activity_calendar'; +import User from './user'; + +// use legacy exports until embedded javascript is refactored +window.Calendar = ActivityCalendar; +window.gl = window.gl || {}; +window.gl.User = User; |