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
f2041fb5
Commit
f2041fb5
authored
Aug 29, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
9a68d6e5
e6869b8f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
12 deletions
+17
-12
app/views/shared/empty_states/_profile_tabs.html.haml
app/views/shared/empty_states/_profile_tabs.html.haml
+1
-1
changelogs/unreleased/fix-create-milestone-btn-success.yml
changelogs/unreleased/fix-create-milestone-btn-success.yml
+5
-0
doc/user/gitlab_com/index.md
doc/user/gitlab_com/index.md
+1
-1
doc/user/project/integrations/webhooks.md
doc/user/project/integrations/webhooks.md
+10
-10
No files found.
app/views/shared/empty_states/_profile_tabs.html.haml
View file @
f2041fb5
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
%p
=
current_user_empty_message_description
%p
=
current_user_empty_message_description
-
if
secondary_button_link
.
present?
-
if
secondary_button_link
.
present?
=
link_to
secondary_button_label
,
secondary_button_link
,
class:
'btn btn-
create
btn-inverted'
=
link_to
secondary_button_label
,
secondary_button_link
,
class:
'btn btn-
success
btn-inverted'
=
link_to
primary_button_label
,
primary_button_link
,
class:
'btn btn-success'
=
link_to
primary_button_label
,
primary_button_link
,
class:
'btn btn-success'
-
else
-
else
...
...
changelogs/unreleased/fix-create-milestone-btn-success.yml
0 → 100644
View file @
f2041fb5
---
title
:
Fix style of secondary profile tab buttons.
merge_request
:
32010
author
:
Wolfgang Faust
type
:
fixed
doc/user/gitlab_com/index.md
View file @
f2041fb5
...
@@ -337,7 +337,7 @@ GitLab.com does not currently use these settings.
...
@@ -337,7 +337,7 @@ GitLab.com does not currently use these settings.
In addition to the GitLab Enterprise Edition Omnibus install, GitLab.com uses
In addition to the GitLab Enterprise Edition Omnibus install, GitLab.com uses
the following applications and settings to achieve scale. All settings are
the following applications and settings to achieve scale. All settings are
located publicly available
[
chef cookbooks
](
https://gitlab.com/gitlab-cookbooks
)
.
publicly available at
[
chef cookbooks
](
https://gitlab.com/gitlab-cookbooks
)
.
### ELK
### ELK
...
...
doc/user/project/integrations/webhooks.md
View file @
f2041fb5
...
@@ -1181,20 +1181,20 @@ X-Gitlab-Event: Job Hook
...
@@ -1181,20 +1181,20 @@ X-Gitlab-Event: Job Hook
```
json
```
json
{
{
"object_kind"
:
"
job
"
,
"object_kind"
:
"
build
"
,
"ref"
:
"gitlab-script-trigger"
,
"ref"
:
"gitlab-script-trigger"
,
"tag"
:
false
,
"tag"
:
false
,
"before_sha"
:
"2293ada6b400935a1378653304eaf6221e0fdb8f"
,
"before_sha"
:
"2293ada6b400935a1378653304eaf6221e0fdb8f"
,
"sha"
:
"2293ada6b400935a1378653304eaf6221e0fdb8f"
,
"sha"
:
"2293ada6b400935a1378653304eaf6221e0fdb8f"
,
"
job
_id"
:
1977
,
"
build
_id"
:
1977
,
"
job
_name"
:
"test"
,
"
build
_name"
:
"test"
,
"
job
_stage"
:
"test"
,
"
build
_stage"
:
"test"
,
"
job
_status"
:
"created"
,
"
build
_status"
:
"created"
,
"
job
_started_at"
:
null
,
"
build
_started_at"
:
null
,
"
job
_finished_at"
:
null
,
"
build
_finished_at"
:
null
,
"
job
_duration"
:
null
,
"
build
_duration"
:
null
,
"
job
_allow_failure"
:
false
,
"
build
_allow_failure"
:
false
,
"
job
_failure_reason"
:
"script_failure"
,
"
build
_failure_reason"
:
"script_failure"
,
"project_id"
:
380
,
"project_id"
:
380
,
"project_name"
:
"gitlab-org/gitlab-test"
,
"project_name"
:
"gitlab-org/gitlab-test"
,
"user"
:
{
"user"
:
{
...
...
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