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
b700da19
Commit
b700da19
authored
Jun 30, 2017
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix doc merge conflicts
parent
859b693f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
21 deletions
+0
-21
CHANGELOG.md
CHANGELOG.md
+0
-10
doc/api/namespaces.md
doc/api/namespaces.md
+0
-11
No files found.
CHANGELOG.md
View file @
b700da19
...
...
@@ -4,23 +4,13 @@ entry.
## 9.3.3 (2017-06-30)
<<<<<<< HEAD
-
No changes.
-
Fix head pipeline stored in merge request for external pipelines. !12478
-
Bring back branches badge to main project page. !12548
-
Fix diff of requirements.txt file by not matching newlines as part of package names.
-
Fixed issue boards closed list not showing all closed issues.
-
Fixed multi-line markdown tooltip buttons in issue edit form.
-
Fix shared runners minutes query to update only projects with used allowance.
- Perform housekeeping only when an import of a fresh project is completed.
=======
-
Fix head pipeline stored in merge request for external pipelines. !12478
-
Bring back branches badge to main project page. !12548
-
Fix diff of requirements.txt file by not matching newlines as part of package names.
-
Perform housekeeping only when an import of a fresh project is completed.
-
Fixed issue boards closed list not showing all closed issues.
-
Fixed multi-line markdown tooltip buttons in issue edit form.
>>>>>>> ce/master
## 9.3.2 (2017-06-27)
...
...
doc/api/namespaces.md
View file @
b700da19
...
...
@@ -35,18 +35,11 @@ Example response:
{
"id"
:
2
,
"path"
:
"group1"
,
<<<<<<<
HEAD
"kind"
:
"group"
"full_path"
:
"group1"
,
"parent_id"
:
"null"
,
"members_count_with_descendants"
:
2
,
"plan"
:
"bronze"
=======
"kind"
:
"group"
,
"full_path"
:
"group1"
,
"parent_id"
:
"null"
,
"members_count_with_descendants"
:
2
>>>>>>>
ce/master
},
{
"id"
:
3
,
...
...
@@ -59,11 +52,7 @@ Example response:
]
```
<<<<<<< HEAD
**Note**
:
`members_count_with_descendants`
and
`plan`
are presented only for group masters/owners.
=======
**Note**
:
`members_count_with_descendants`
are presented only for group masters/owners.
>>>>>>> ce/master
## Search for namespace
...
...
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