summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-03 10:26:16 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-03 10:26:16 +0000
commitd0e74f49b47e83ebde89be163a9344a0bae14626 (patch)
tree622a2244a7f3cc3da886342958a45a2a58a98a6a
parentb9e53258c505abeda8a975b550f2cb276caaf01b (diff)
parentd0398514b8b8eda7d03ba89b250554ff60a29ed4 (diff)
downloadgitlab-ce-d0e74f49b47e83ebde89be163a9344a0bae14626.tar.gz
Merge branch 'new-file-link' into 'master'
Add 'New file' link to dropdown on project page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Screenshot: ![Screenshot_2015-11-02_15.33.41](/uploads/ecc87c6bda9e3f0680e5422d5cdc08f9/Screenshot_2015-11-02_15.33.41.png) Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2562 See merge request !1719
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/projects/buttons/_dropdown.html.haml4
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 588909d2578..c2bf3bf559b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,7 @@ v 8.2.0 (unreleased)
- Remove deprecated CI events from project settings page
- Use issue editor as cross reference comment author when issue is edited with a new mention.
- [API] Add ability to fetch the commit ID of the last commit that actually touched a file
+ - Add "New file" link to dropdown on project page
v 8.1.1
- Fix cloning Wiki repositories via HTTP (Stan Hu)
diff --git a/app/views/projects/buttons/_dropdown.html.haml b/app/views/projects/buttons/_dropdown.html.haml
index 4580c912692..bed2b16249e 100644
--- a/app/views/projects/buttons/_dropdown.html.haml
+++ b/app/views/projects/buttons/_dropdown.html.haml
@@ -21,6 +21,10 @@
- if can?(current_user, :push_code, @project)
%li.divider
%li
+ = link_to namespace_project_new_blob_path(@project.namespace, @project, @project.default_branch || 'master'), title: 'New file' do
+ = icon('file fw')
+ New file
+ %li
= link_to new_namespace_project_branch_path(@project.namespace, @project) do
= icon('code-fork fw')
New branch