BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 491a3127 by James Lopez
Options

fix merge conflict

parent 6a70c060
Showing with 3 additions and 3 deletions
CHANGELOG
...@@ -47,14 +47,14 @@ v 8.8.0 (unreleased) ...@@ -47,14 +47,14 @@ v 8.8.0 (unreleased)
- Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3 - Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3
- Total method execution timings are no longer tracked - Total method execution timings are no longer tracked
v 8.7.6
- Fix external imports not finding the import data
v 8.7.5 v 8.7.5
- Fix relative links in wiki pages. !4050 - Fix relative links in wiki pages. !4050
- Fix always showing build notification message when switching between merge requests !4086 - Fix always showing build notification message when switching between merge requests !4086
- Fix an issue when filtering merge requests with more than one label. !3886 - Fix an issue when filtering merge requests with more than one label. !3886
v 8.7.6
- Fix external imports not finding the import data
v 8.7.4 v 8.7.4
- Links for Redmine issue references are generated correctly again !4048 (Benedikt Huss) - Links for Redmine issue references are generated correctly again !4048 (Benedikt Huss)
- Fix setting trusted proxies !3970 - Fix setting trusted proxies !3970
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment