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
d1f99bcc
Commit
d1f99bcc
authored
May 24, 2016
by
Connor Shea
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve some issues Jacob brought up.
parent
1a85f80b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
app/views/profiles/preferences/show.html.haml
app/views/profiles/preferences/show.html.haml
+3
-3
app/views/projects/triggers/index.html.haml
app/views/projects/triggers/index.html.haml
+4
-4
No files found.
app/views/profiles/preferences/show.html.haml
View file @
d1f99bcc
...
...
@@ -5,7 +5,7 @@
%h4
.prepend-top-0
Application theme
%p
Customize the appearance of the interface
.
This setting allows you to customize the appearance of the site, e.g. the sidebar
.
.col-lg-9.application-theme
-
Gitlab
::
Themes
.
each
do
|
theme
|
=
label_tag
do
...
...
@@ -18,7 +18,7 @@
%h4
.prepend-top-0
Syntax highlighting theme
%p
Customize the syntax highlighting
.
This setting allow you to customize the appearance of the syntax
.
.col-lg-9.syntax-theme
-
Gitlab
::
ColorSchemes
.
each
do
|
scheme
|
=
label_tag
do
...
...
@@ -31,7 +31,7 @@
%h4
.prepend-top-0
Behavior
%p
C
ustomize the behavior of the system layout and default views.
This setting allows you to c
ustomize the behavior of the system layout and default views.
.col-lg-9
.form-group
=
f
.
label
:layout
,
class:
'label-light'
do
...
...
app/views/projects/triggers/index.html.haml
View file @
d1f99bcc
...
...
@@ -5,7 +5,7 @@
%h4
.prepend-top-0
=
page_title
%p
Triggers can force a specific branch or tag to rebuild
using
an API call.
Triggers can force a specific branch or tag to rebuild
with
an API call.
.col-lg-9
%h5
.prepend-top-0
Your triggers
...
...
@@ -19,7 +19,7 @@
=
render
partial:
'trigger'
,
collection:
@triggers
,
as: :trigger
-
else
%p
.settings-message.text-center.append-bottom-default
There are no triggers to use, create a trigger
using the button below.
No triggers have been created yet. Add one
using the button below.
=
form_for
@trigger
,
url:
url_for
(
controller:
'projects/triggers'
,
action:
'create'
)
do
|
f
|
=
f
.
submit
"Add Trigger"
,
class:
'btn btn-success'
...
...
@@ -28,7 +28,7 @@
Use CURL
%p
.light
Copy the token above
and set your branch or tag name. This is the reference that
will be rebuilt.
Copy the token above
, set your branch or tag name, and that reference
will be rebuilt.
%pre
:plain
...
...
@@ -57,7 +57,7 @@
%p
.light
Add
%code
variables[VARIABLE]=VALUE
to
API requests. Variable values can be used to distinguish triggered
and normal builds.
to
an API request. Variable values can be used to distinguish between triggered builds
and normal builds.
%pre
.append-bottom-0
:plain
...
...
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