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
c8502e37
Commit
c8502e37
authored
Feb 01, 2018
by
bikebilly
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change "Set up CI" to "Set up CI/CD"
parent
f016c780
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
8 deletions
+8
-8
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+1
-1
doc/topics/autodevops/index.md
doc/topics/autodevops/index.md
+1
-1
doc/user/project/pages/getting_started_part_two.md
doc/user/project/pages/getting_started_part_two.md
+4
-4
doc/user/project/repository/web_editor.md
doc/user/project/repository/web_editor.md
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+1
-1
No files found.
app/views/projects/show.html.haml
View file @
c8502e37
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
-
unless
@repository
.
gitlab_ci_yml
-
unless
@repository
.
gitlab_ci_yml
%li
.missing
%li
.missing
=
link_to
add_special_file_path
(
@project
,
file_name:
'.gitlab-ci.yml'
)
do
=
link_to
add_special_file_path
(
@project
,
file_name:
'.gitlab-ci.yml'
)
do
#{
_
(
'Set up CI'
)
}
#{
_
(
'Set up CI
/CD
'
)
}
-
if
koding_enabled?
&&
@repository
.
koding_yml
.
blank?
-
if
koding_enabled?
&&
@repository
.
koding_yml
.
blank?
%li
.missing
%li
.missing
=
link_to
_
(
'Set up Koding'
),
add_koding_stack_path
(
@project
)
=
link_to
_
(
'Set up Koding'
),
add_koding_stack_path
(
@project
)
...
...
doc/topics/autodevops/index.md
View file @
c8502e37
...
@@ -395,7 +395,7 @@ If you want to modify the CI/CD pipeline used by Auto DevOps, you can copy the
...
@@ -395,7 +395,7 @@ If you want to modify the CI/CD pipeline used by Auto DevOps, you can copy the
Assuming that your project is new or it doesn't have a
`.gitlab-ci.yml`
file
Assuming that your project is new or it doesn't have a
`.gitlab-ci.yml`
file
present:
present:
1.
From your project home page, either click on the "Set up CI" button, or click
1.
From your project home page, either click on the "Set up CI
/CD
" button, or click
on the plus button and (
`+`
), then "New file"
on the plus button and (
`+`
), then "New file"
1.
Pick
`.gitlab-ci.yml`
as the template type
1.
Pick
`.gitlab-ci.yml`
as the template type
1.
Select "Auto-DevOps" from the template dropdown
1.
Select "Auto-DevOps" from the template dropdown
...
...
doc/user/project/pages/getting_started_part_two.md
View file @
c8502e37
...
@@ -77,7 +77,7 @@ is useful for submitting merge requests to the upstream.
...
@@ -77,7 +77,7 @@ is useful for submitting merge requests to the upstream.
>
>
> 2. Why do I need to enable Shared Runners?
> 2. Why do I need to enable Shared Runners?
>
>
> Shared Runners will run the script set by your GitLab CI
> Shared Runners will run the script set by your GitLab CI
/CD
configuration file. They're enabled by default to new projects,
configuration file. They're enabled by default to new projects,
but not to forks.
but not to forks.
...
@@ -88,9 +88,9 @@ click **New project**, and name it considering the
...
@@ -88,9 +88,9 @@ click **New project**, and name it considering the
[
practical examples
](
getting_started_part_one.md#practical-examples
)
.
[
practical examples
](
getting_started_part_one.md#practical-examples
)
.
1.
Clone it to your local computer, add your website
1.
Clone it to your local computer, add your website
files to your project, add, commit and push to GitLab.
files to your project, add, commit and push to GitLab.
1.
From the your
**Project**
's page, click
**Set up CI**
:
1.
From the your
**Project**
's page, click
**Set up CI
/CD
**
:
![setup GitLab CI](img/setup_ci.png)
![setup GitLab CI
/CD
](img/setup_ci.png)
1.
Choose one of the templates from the dropbox menu.
1.
Choose one of the templates from the dropbox menu.
Pick up the template corresponding to the SSG you're using (or plain HTML).
Pick up the template corresponding to the SSG you're using (or plain HTML).
...
@@ -98,7 +98,7 @@ Pick up the template corresponding to the SSG you're using (or plain HTML).
...
@@ -98,7 +98,7 @@ Pick up the template corresponding to the SSG you're using (or plain HTML).
![gitlab-ci templates](img/choose_ci_template.png)
![gitlab-ci templates](img/choose_ci_template.png)
Once you have both site files and
`.gitlab-ci.yml`
in your project's
Once you have both site files and
`.gitlab-ci.yml`
in your project's
root, GitLab CI will build your site and deploy it with Pages.
root, GitLab CI
/CD
will build your site and deploy it with Pages.
Once the first build passes, you see your site is live by
Once the first build passes, you see your site is live by
navigating to your
**Project**
's
**Settings**
>
**Pages**
,
navigating to your
**Project**
's
**Settings**
>
**Pages**
,
where you'll find its default URL.
where you'll find its default URL.
...
...
doc/user/project/repository/web_editor.md
View file @
c8502e37
...
@@ -45,7 +45,7 @@ has already been created, which creates a link to the license itself.
...
@@ -45,7 +45,7 @@ has already been created, which creates a link to the license itself.
![
New file button
](
img/web_editor_template_dropdown_buttons.png
)
![
New file button
](
img/web_editor_template_dropdown_buttons.png
)
>**Note:**
>**Note:**
The
**Set up CI**
button will not appear on an empty repository. You have to at
The
**Set up CI
/CD
**
button will not appear on an empty repository. You have to at
least add a file in order for the button to show up.
least add a file in order for the button to show up.
## Upload a file
## Upload a file
...
...
locale/gitlab.pot
View file @
c8502e37
...
@@ -2087,7 +2087,7 @@ msgstr ""
...
@@ -2087,7 +2087,7 @@ msgstr ""
msgid "Set a password on your account to pull or push via %{protocol}."
msgid "Set a password on your account to pull or push via %{protocol}."
msgstr ""
msgstr ""
msgid "Set up CI"
msgid "Set up CI
/CD
"
msgstr ""
msgstr ""
msgid "Set up Koding"
msgid "Set up Koding"
...
...
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