summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/environments/components/environment_terminal_button.js.es6
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-01-05 18:40:35 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-01-05 18:40:35 +0000
commit8181f58d4407ee273cdf5792aa810d2b008f63d6 (patch)
treefeb96cdecf106abc4d0272641577191393360cf1 /app/assets/javascripts/environments/components/environment_terminal_button.js.es6
parente4da8b11a2222a4ef12025e08b250a5c78dfa2c9 (diff)
parentcd85baf5e363847ee1cca2e154e5fb47484e0fdf (diff)
downloadgitlab-ce-8181f58d4407ee273cdf5792aa810d2b008f63d6.tar.gz
Merge branch 'master' into auto-pipelines-vue
* master: (35 commits) Adds back removed class in merge request pipelines table Fix dropdown icon alignment Simplify HTML of mini pipeline graph and dropdown Creates individual html for dropdown Adds simplified CSS for the new dropdown Removes old CSS Improves dropdown item in Chrome, Firefox and Safari Use SCSS variables for colors. Fix scss linter errors Adds animation when the stage is hovered. Adds back tooltip on dropdown toggle Fixes broken tests additional css changes to get more into direction of mockups Adds CHANGELOG entry Removes unneeded `window` declaration Decreases font-size on login page Ensure internal Gitlab::Git references use the namespace Absorb gitlab_git Fix review comments. Add spec for note edit and fix one commented spec. Review fixes. Use gl.utils.isInViewport and improve gl.utils.animateToElement. Make sure elements share the same scope Hide edit warning element when form reverted. Remove unnecessary styling came from merge conflicts. Fix single note edit form specs. Separate edit form in Changes and Discussions tab. Fix warning styling for responsive design. Fix task list for single edit note widget changes. Fix notes spec. ...
Diffstat (limited to 'app/assets/javascripts/environments/components/environment_terminal_button.js.es6')
-rw-r--r--app/assets/javascripts/environments/components/environment_terminal_button.js.es62
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/environments/components/environment_terminal_button.js.es6 b/app/assets/javascripts/environments/components/environment_terminal_button.js.es6
index 25e6ac7f3c9..050184ba497 100644
--- a/app/assets/javascripts/environments/components/environment_terminal_button.js.es6
+++ b/app/assets/javascripts/environments/components/environment_terminal_button.js.es6
@@ -5,7 +5,7 @@
window.gl = window.gl || {};
window.gl.environmentsList = window.gl.environmentsList || {};
- window.gl.environmentsList.TerminalButtonComponent = Vue.component('terminal-button-component', {
+ gl.environmentsList.TerminalButtonComponent = Vue.component('terminal-button-component', {
props: {
terminalPath: {
type: String,