BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
8ab5df9d
Commit
8ab5df9d
authored
Nov 12, 2015
by
Kamil Trzciński
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ci-deprecate-dumped-yaml' into 'master'
Remove deprecated dumped yaml file generated from previous job definitions See merge request !1777
parents
7ec7970b
d024db0c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
24 deletions
+1
-24
CHANGELOG
CHANGELOG
+1
-0
projects_controller.rb
app/controllers/ci/projects_controller.rb
+0
-4
edit.html.haml
app/views/projects/ci_settings/edit.html.haml
+0
-19
routes.rb
config/routes.rb
+0
-1
No files found.
CHANGELOG
View file @
8ab5df9d
...
...
@@ -30,6 +30,7 @@ v 8.2.0 (unreleased)
- Rename "Back to" links to "Go to" because its not always a case it point to place user come from
- Allow groups to appear in the search results if the group owner allows it
- New design for project graphs page
- Remove deprecated dumped yaml file generated from previous job definitions
- Fix incoming email config defaults
- MR target branch is now visible on a list view when it is different from project's default one
- Improve Continuous Integration graphs page
...
...
app/controllers/ci/projects_controller.rb
View file @
8ab5df9d
...
...
@@ -26,10 +26,6 @@ module Ci
redirect_to
namespace_project_runners_path
(
project
.
gl_project
.
namespace
,
project
.
gl_project
)
end
def
dumped_yaml
send_data
@project
.
generated_yaml_config
,
filename:
'.gitlab-ci.yml'
end
protected
def
project
...
...
app/views/projects/ci_settings/edit.html.haml
View file @
8ab5df9d
-
page_title
"CI Settings"
-
if
@ci_project
.
generated_yaml_config
%p
.alert.alert-danger
CI Jobs are deprecated now, you can
#{
link_to
"download"
,
dumped_yaml_ci_project_path
(
@ci_project
)
}
or
%a
.preview-yml
{
:href
=>
"#yaml-content"
,
"data-toggle"
=>
"modal"
}
preview
yaml file which is based on your old jobs.
Put this file to the root of your project and name it .gitlab-ci.yml
-
if
no_runners_for_project?
(
@ci_project
)
=
render
'no_runners'
=
render
'form'
-
if
@ci_project
.
generated_yaml_config
#yaml-content
.modal.fade
{
"aria-hidden"
=>
"true"
,
"aria-labelledby"
=>
".gitlab-ci.yml"
,
:role
=>
"dialog"
,
:tabindex
=>
"-1"
}
.modal-dialog
.modal-content
.modal-header
%button
.close
{
"aria-hidden"
=>
"true"
,
"data-dismiss"
=>
"modal"
,
:type
=>
"button"
}
×
%h4
.modal-title
Content of .gitlab-ci.yml
.modal-body
=
text_area_tag
:yaml
,
@ci_project
.
generated_yaml_config
,
size:
"70x25"
,
class:
"form-control"
.modal-footer
%button
.btn.btn-default
{
"data-dismiss"
=>
"modal"
,
:type
=>
"button"
}
Close
config/routes.rb
View file @
8ab5df9d
...
...
@@ -32,7 +32,6 @@ Gitlab::Application.routes.draw do
get
:status
,
to:
'projects#badge'
get
:integration
post
:toggle_shared_runners
get
:dumped_yaml
end
resources
:runner_projects
,
only:
[
:create
,
:destroy
]
...
...
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