Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6f694f24
Commit
6f694f24
authored
Aug 03, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Uses npm css and removes css from vendor folder
parent
2c87a2c7
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
2209 deletions
+6
-2209
app/assets/javascripts/terminal/terminal.js
app/assets/javascripts/terminal/terminal.js
+2
-0
app/assets/stylesheets/application.scss
app/assets/stylesheets/application.scss
+0
-1
app/views/projects/jobs/terminal.html.haml
app/views/projects/jobs/terminal.html.haml
+1
-1
config/application.rb
config/application.rb
+3
-1
vendor/assets/stylesheets/xterm/xterm.css
vendor/assets/stylesheets/xterm/xterm.css
+0
-2206
No files found.
app/assets/javascripts/terminal/terminal.js
View file @
6f694f24
...
@@ -19,6 +19,7 @@ export default class GLTerminal {
...
@@ -19,6 +19,7 @@ export default class GLTerminal {
this
.
setSocketUrl
();
this
.
setSocketUrl
();
this
.
createTerminal
();
this
.
createTerminal
();
$
(
window
)
$
(
window
)
.
off
(
'
resize.terminal
'
)
.
off
(
'
resize.terminal
'
)
.
on
(
'
resize.terminal
'
,
()
=>
{
.
on
(
'
resize.terminal
'
,
()
=>
{
...
@@ -45,6 +46,7 @@ export default class GLTerminal {
...
@@ -45,6 +46,7 @@ export default class GLTerminal {
this
.
socket
.
binaryType
=
'
arraybuffer
'
;
this
.
socket
.
binaryType
=
'
arraybuffer
'
;
this
.
terminal
.
open
(
this
.
container
);
this
.
terminal
.
open
(
this
.
container
);
this
.
terminal
.
fit
();
this
.
socket
.
onopen
=
()
=>
{
this
.
socket
.
onopen
=
()
=>
{
this
.
runTerminal
();
this
.
runTerminal
();
...
...
app/assets/stylesheets/application.scss
View file @
6f694f24
...
@@ -18,7 +18,6 @@
...
@@ -18,7 +18,6 @@
*/
*/
@import
"../../../node_modules/pikaday/scss/pikaday"
;
@import
"../../../node_modules/pikaday/scss/pikaday"
;
@import
"../../../node_modules/xterm/src/xterm.css"
;
/*
/*
...
...
app/views/projects/jobs/terminal.html.haml
View file @
6f694f24
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
-
page_title
'Terminal'
,
"
#{
@build
.
name
}
(#
#{
@build
.
id
}
)"
,
'Jobs'
-
page_title
'Terminal'
,
"
#{
@build
.
name
}
(#
#{
@build
.
id
}
)"
,
'Jobs'
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
stylesheet_link_tag
"xterm
/xterm
"
=
stylesheet_link_tag
"xterm
.css
"
.terminal-container
{
class:
container_class
}
.terminal-container
{
class:
container_class
}
#terminal
{
data:
{
project_path:
terminal_project_job_path
(
@project
,
@build
,
format: :ws
)
}
}
#terminal
{
data:
{
project_path:
terminal_project_job_path
(
@project
,
@build
,
format: :ws
)
}
}
config/application.rb
View file @
6f694f24
...
@@ -147,7 +147,6 @@ module Gitlab
...
@@ -147,7 +147,6 @@ module Gitlab
config
.
assets
.
precompile
<<
"print.css"
config
.
assets
.
precompile
<<
"print.css"
config
.
assets
.
precompile
<<
"notify.css"
config
.
assets
.
precompile
<<
"notify.css"
config
.
assets
.
precompile
<<
"mailers/*.css"
config
.
assets
.
precompile
<<
"mailers/*.css"
config
.
assets
.
precompile
<<
"xterm/xterm.css"
config
.
assets
.
precompile
<<
"page_bundles/ide.css"
config
.
assets
.
precompile
<<
"page_bundles/ide.css"
config
.
assets
.
precompile
<<
"performance_bar.css"
config
.
assets
.
precompile
<<
"performance_bar.css"
config
.
assets
.
precompile
<<
"lib/ace.js"
config
.
assets
.
precompile
<<
"lib/ace.js"
...
@@ -163,6 +162,9 @@ module Gitlab
...
@@ -163,6 +162,9 @@ module Gitlab
config
.
assets
.
precompile
<<
"icons.json"
config
.
assets
.
precompile
<<
"icons.json"
config
.
assets
.
precompile
<<
"illustrations/*.svg"
config
.
assets
.
precompile
<<
"illustrations/*.svg"
config
.
assets
.
paths
<<
"
#{
config
.
root
}
/node_modules/xterm/src/"
config
.
assets
.
precompile
<<
"xterm.css"
## EE-specific assets config START
## EE-specific assets config START
%w[images javascripts stylesheets]
.
each
do
|
path
|
%w[images javascripts stylesheets]
.
each
do
|
path
|
config
.
assets
.
paths
<<
"
#{
config
.
root
}
/ee/app/assets/
#{
path
}
"
config
.
assets
.
paths
<<
"
#{
config
.
root
}
/ee/app/assets/
#{
path
}
"
...
...
vendor/assets/stylesheets/xterm/xterm.css
deleted
100644 → 0
View file @
2c87a2c7
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment