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
0a79e5cd
Commit
0a79e5cd
authored
Oct 10, 2016
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace generic table with
parent
5196f602
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
14 additions
and
14 deletions
+14
-14
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+2
-2
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+2
-2
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+2
-2
app/views/admin/runners/show.html.haml
app/views/admin/runners/show.html.haml
+1
-1
app/views/projects/builds/_table.html.haml
app/views/projects/builds/_table.html.haml
+1
-1
app/views/projects/commit/_pipeline.html.haml
app/views/projects/commit/_pipeline.html.haml
+1
-1
app/views/projects/commit/_pipelines_list.haml
app/views/projects/commit/_pipelines_list.haml
+1
-1
app/views/projects/environments/index.html.haml
app/views/projects/environments/index.html.haml
+1
-1
app/views/projects/environments/show.html.haml
app/views/projects/environments/show.html.haml
+1
-1
app/views/projects/pipelines/index.html.haml
app/views/projects/pipelines/index.html.haml
+1
-1
spec/features/merge_requests/created_from_fork_spec.rb
spec/features/merge_requests/created_from_fork_spec.rb
+1
-1
No files found.
app/assets/stylesheets/pages/environments.scss
View file @
0a79e5cd
...
@@ -52,13 +52,13 @@
...
@@ -52,13 +52,13 @@
}
}
}
}
.table.
builds
.environments
{
.table.
ci-table
.environments
{
.icon-container
{
.icon-container
{
width
:
20px
;
width
:
20px
;
text-align
:
center
;
text-align
:
center
;
}
}
.branch-commit
{
.branch-commit
{
.commit-id
{
.commit-id
{
margin-right
:
0
;
margin-right
:
0
;
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
0a79e5cd
...
@@ -264,7 +264,7 @@
...
@@ -264,7 +264,7 @@
line-height
:
31px
;
line-height
:
31px
;
}
}
.
builds
{
.
ci-table
{
.table-holder
{
.table-holder
{
overflow-x
:
auto
;
overflow-x
:
auto
;
}
}
...
@@ -357,7 +357,7 @@
...
@@ -357,7 +357,7 @@
}
}
.table-holder
{
.table-holder
{
.
builds
{
.
ci-table
{
th
{
th
{
background-color
:
$white-light
;
background-color
:
$white-light
;
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
0a79e5cd
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
margin
:
4px
;
margin
:
4px
;
}
}
.table.
builds
{
.table.
ci-table
{
min-width
:
1200px
;
min-width
:
1200px
;
.branch-commit
{
.branch-commit
{
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
overflow
:
auto
;
overflow
:
auto
;
}
}
.table.
builds
{
.table.
ci-table
{
min-width
:
900px
;
min-width
:
900px
;
&
.pipeline
{
&
.pipeline
{
...
...
app/views/admin/runners/show.html.haml
View file @
0a79e5cd
...
@@ -71,7 +71,7 @@
...
@@ -71,7 +71,7 @@
.col-md-6
.col-md-6
%h4
Recent builds served by this Runner
%h4
Recent builds served by this Runner
%table
.table.
builds
.runner-builds
%table
.table.
ci-table
.runner-builds
%thead
%thead
%tr
%tr
%th
Build
%th
Build
...
...
app/views/projects/builds/_table.html.haml
View file @
0a79e5cd
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
.nothing-here-block
No builds to show
.nothing-here-block
No builds to show
-
else
-
else
.table-holder
.table-holder
%table
.table.
builds
%table
.table.
ci-table
%thead
%thead
%tr
%tr
%th
Status
%th
Status
...
...
app/views/projects/commit/_pipeline.html.haml
View file @
0a79e5cd
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
\.gitlab-ci.yml not found in this commit
\.gitlab-ci.yml not found in this commit
.table-holder.pipeline-holder
.table-holder.pipeline-holder
%table
.table.
builds
.pipeline
%table
.table.
ci-table
.pipeline
%thead
%thead
%tr
%tr
%th
Status
%th
Status
...
...
app/views/projects/commit/_pipelines_list.haml
View file @
0a79e5cd
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
.nothing-here-block
No pipelines to show
.nothing-here-block
No pipelines to show
-
else
-
else
.table-holder
.table-holder
%table
.table.
builds
%table
.table.
ci-table
%tbody
%tbody
%th
Status
%th
Status
%th
Pipeline
%th
Pipeline
...
...
app/views/projects/environments/index.html.haml
View file @
0a79e5cd
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
New environment
New environment
-
else
-
else
.table-holder
.table-holder
%table
.table.
builds
.environments
%table
.table.
ci-table
.environments
%tbody
%tbody
%th
Environment
%th
Environment
%th
Last Deployment
%th
Last Deployment
...
...
app/views/projects/environments/show.html.haml
View file @
0a79e5cd
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
=
link_to
"Read more"
,
help_page_path
(
"ci/environments"
),
class:
"btn btn-success"
=
link_to
"Read more"
,
help_page_path
(
"ci/environments"
),
class:
"btn btn-success"
-
else
-
else
.table-holder
.table-holder
%table
.table.
builds
.environments
%table
.table.
ci-table
.environments
%thead
%thead
%tr
%tr
%th
ID
%th
ID
...
...
app/views/projects/pipelines/index.html.haml
View file @
0a79e5cd
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
.nothing-here-block
No pipelines to show
.nothing-here-block
No pipelines to show
-
else
-
else
.table-holder
.table-holder
%table
.table.
builds
%table
.table.
ci-table
%thead
%thead
%th
.col-xs-1.col-sm-1
Status
%th
.col-xs-1.col-sm-1
Status
%th
.col-xs-2.col-sm-4
Pipeline
%th
.col-xs-2.col-sm-4
Pipeline
...
...
spec/features/merge_requests/created_from_fork_spec.rb
View file @
0a79e5cd
...
@@ -45,7 +45,7 @@ feature 'Merge request created from fork' do
...
@@ -45,7 +45,7 @@ feature 'Merge request created from fork' do
page
.
within
(
'.merge-request-tabs'
)
{
click_link
'Builds'
}
page
.
within
(
'.merge-request-tabs'
)
{
click_link
'Builds'
}
wait_for_ajax
wait_for_ajax
page
.
within
(
'table.
builds
'
)
do
page
.
within
(
'table.
ci-table
'
)
do
expect
(
page
).
to
have_content
'rspec'
expect
(
page
).
to
have_content
'rspec'
expect
(
page
).
to
have_content
'spinach'
expect
(
page
).
to
have_content
'spinach'
end
end
...
...
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