Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-02 12:10:22 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-02 12:10:22 +0300
commit59950380b69f5d1fdc3efae3c8e4062c0782cf25 (patch)
tree58b19010a098121f9a9caedb08585252830b62b8 /CHANGELOG
parent2cbf45282168938696867072cb3e35131bc44a93 (diff)
parentb643fa16039b9da8a52527e1a657401415684f21 (diff)
Merge branch 'disable-deploy-edit-link' into 'master'
Remove link leading to a 404 error in Deploy Keys page ### What does this MR do? This MR removes a link that would lead an admin to believe he/she could edit a deploy key, but clicking on this link would lead to a 404. ### Screenshot ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/b36cd76287d6389a09f9e0e49c1b6751/image.png) ### What are the relevant issue numbers? Closes #1866 See merge request !923
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f1be68aba74..c92a66230ab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 7.13.0 (unreleased)
- Fix external issue tracker hook/test for HTTPS URLs (Daniel Gerhardt)
+ - Remove link leading to a 404 error in Deploy Keys page (Stan Hu)
- Fix order of issues imported form GitHub (Hiroyuki Sato)
- Bump rugments to 1.0.0beta8 to fix C prototype function highlighting (Jonathon Reinhart)
- Fix Merge Request webhook to properly fire "merge" action when accepted from the web UI