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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
6a8a3f25
Commit
6a8a3f25
authored
Nov 07, 2017
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into add-ingress-to-cluster-applications
parents
fa3af6de
d9a1dc3d
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
26 deletions
+12
-26
app/assets/javascripts/repo/components/repo_file.vue
app/assets/javascripts/repo/components/repo_file.vue
+4
-1
app/assets/javascripts/repo/components/repo_loading_file.vue
app/assets/javascripts/repo/components/repo_loading_file.vue
+1
-1
app/assets/javascripts/repo/components/repo_sidebar.vue
app/assets/javascripts/repo/components/repo_sidebar.vue
+1
-1
app/assets/stylesheets/framework/animations.scss
app/assets/stylesheets/framework/animations.scss
+0
-16
app/assets/stylesheets/pages/repo.scss
app/assets/stylesheets/pages/repo.scss
+4
-0
app/views/shared/icons/_icon_autodevops.svg
app/views/shared/icons/_icon_autodevops.svg
+2
-2
changelogs/unreleased/animate-auto-devops.yml
changelogs/unreleased/animate-auto-devops.yml
+0
-5
No files found.
app/assets/javascripts/repo/components/repo_file.vue
View file @
6a8a3f25
...
@@ -54,7 +54,10 @@
...
@@ -54,7 +54,10 @@
<tr
<tr
class=
"file"
class=
"file"
@
click.prevent=
"clickedTreeRow(file)"
>
@
click.prevent=
"clickedTreeRow(file)"
>
<td
:colspan=
"submoduleColSpan"
>
<td
class=
"multi-file-table-col-name"
:colspan=
"submoduleColSpan"
>
<i
<i
class=
"fa fa-fw file-icon"
class=
"fa fa-fw file-icon"
:class=
"fileIcon"
:class=
"fileIcon"
...
...
app/assets/javascripts/repo/components/repo_loading_file.vue
View file @
6a8a3f25
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
class=
"loading-file"
class=
"loading-file"
aria-label=
"Loading files"
aria-label=
"Loading files"
>
>
<td>
<td
class=
"multi-file-table-col-name"
>
<skeleton-loading-container
<skeleton-loading-container
:small=
"true"
:small=
"true"
/>
/>
...
...
app/assets/javascripts/repo/components/repo_sidebar.vue
View file @
6a8a3f25
...
@@ -57,7 +57,7 @@ export default {
...
@@ -57,7 +57,7 @@ export default {
</strong>
</strong>
</th>
</th>
<template
v-else
>
<template
v-else
>
<th
class=
"name"
>
<th
class=
"name
multi-file-table-col-name
"
>
Name
Name
</th>
</th>
<th
class=
"hidden-sm hidden-xs last-commit"
>
<th
class=
"hidden-sm hidden-xs last-commit"
>
...
...
app/assets/stylesheets/framework/animations.scss
View file @
6a8a3f25
...
@@ -23,16 +23,6 @@
...
@@ -23,16 +23,6 @@
@include
webkit-prefix
(
animation-duration
,
2s
);
@include
webkit-prefix
(
animation-duration
,
2s
);
}
}
&
.spin-cw
{
transform-origin
:
center
;
animation
:
spin
4s
linear
infinite
;
}
&
.spin-ccw
{
transform-origin
:
center
;
animation
:
spin
4s
linear
infinite
reverse
;
}
&
.flipOutX
,
&
.flipOutX
,
&
.flipOutY
,
&
.flipOutY
,
&
.bounceIn
,
&
.bounceIn
,
...
@@ -281,9 +271,3 @@ a {
...
@@ -281,9 +271,3 @@ a {
transform
:
translateX
(
468px
);
transform
:
translateX
(
468px
);
}
}
}
}
@keyframes
spin
{
100
%
{
transform
:
rotate
(
360deg
);
}
}
app/assets/stylesheets/pages/repo.scss
View file @
6a8a3f25
...
@@ -298,3 +298,7 @@
...
@@ -298,3 +298,7 @@
width
:
100%
;
width
:
100%
;
}
}
}
}
.multi-file-table-col-name
{
width
:
350px
;
}
app/views/shared/icons/_icon_autodevops.svg
View file @
6a8a3f25
This diff is collapsed.
Click to expand it.
changelogs/unreleased/animate-auto-devops.yml
deleted
100644 → 0
View file @
fa3af6de
---
title
:
Animate auto devops graphic
merge_request
:
author
:
type
:
other
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