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
30e94ece
Commit
30e94ece
authored
Apr 10, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix conflicts for CHANGELOG.md
parent
fb10506b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
7 deletions
+0
-7
CHANGELOG.md
CHANGELOG.md
+0
-7
No files found.
CHANGELOG.md
View file @
30e94ece
...
...
@@ -4,11 +4,7 @@ entry.
## 10.6.4 (2018-04-09)
<<<<<<< HEAD
### Fixed (9 changes, 1 of them is from the community)
=======
### Fixed (8 changes, 1 of them is from the community)
>>>>>>> upstream/master
-
Correct copy text for the promote milestone and label modals. !17726
-
Avoid validation errors when running the Pages domain verification service. !17992
...
...
@@ -16,10 +12,7 @@ entry.
-
Fix exceptions raised when migrating pipeline stages in the background. !18076
-
Work around Prometheus Helm chart name changes to fix integration. !18206 (joshlambert)
-
Don't show Jump to Discussion button on Issues.
<<<<<<< HEAD
-
Fix data race between ObjectStorage background_upload and Pages publishing.
=======
>>>>>>> upstream/master
-
Fix listing commit branch/tags that contain special characters.
-
Fix 404 in group boards when moving issue between lists.
...
...
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