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
ef7f002e
Commit
ef7f002e
authored
Apr 25, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bootstrap4' of gitlab.com:gitlab-org/gitlab-ce into bootstrap4
parents
56982fcf
dc69ae17
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/views/ci/variables/_index.html.haml
app/views/ci/variables/_index.html.haml
+1
-1
spec/features/projects/tree/create_directory_spec.rb
spec/features/projects/tree/create_directory_spec.rb
+0
-2
spec/javascripts/sidebar/sidebar_move_issue_spec.js
spec/javascripts/sidebar/sidebar_move_issue_spec.js
+3
-1
No files found.
app/views/ci/variables/_index.html.haml
View file @
ef7f002e
...
...
@@ -2,7 +2,7 @@
.row
.col-lg-12.js-ci-variable-list-section
{
data:
{
save_endpoint:
save_endpoint
}
}
.hid
e
.alert.alert-danger.js-ci-variable-error-box
.hid
den
.alert.alert-danger.js-ci-variable-error-box
%ul
.ci-variable-list
-
@variables
.
each
.
each
do
|
variable
|
...
...
spec/features/projects/tree/create_directory_spec.rb
View file @
ef7f002e
...
...
@@ -10,8 +10,6 @@ feature 'Multi-file editor new directory', :js do
visit
project_tree_path
(
project
,
:master
)
live_debug
wait_for_requests
click_link
(
'Web IDE'
)
...
...
spec/javascripts/sidebar/sidebar_move_issue_spec.js
View file @
ef7f002e
...
...
@@ -14,7 +14,9 @@ describe('SidebarMoveIssue', function () {
this
.
$content
=
$
(
`
<div class="dropdown">
<div class="js-toggle"></div>
<div class="dropdown-content"></div>
<div class="dropdown-menu">
<div class="dropdown-content"></div>
</div>
<div class="js-confirm-button"></div>
</div>
`
);
...
...
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