Commit graph

10 commits

Author SHA1 Message Date
Douwe Maan
1b9e2530de Merge branch 'master' into edit-on-fork
# Conflicts:
#	app/views/projects/tree/_tree_header.html.haml
2015-12-18 17:15:05 +01:00
Douwe Maan
0ac57a540d Satisfy Rubocop 2015-12-18 11:19:08 +01:00
Douwe Maan
d9c82d679f Automatically fork a project when not allowed to edit a file. 2015-12-18 10:03:34 +01:00
Drew Blessing
50ef67617c Add branch and tag operation to tree dropdown 2015-12-17 14:50:00 -06:00
Douwe Maan
f7ff146aaa Fix size of disabled 'New file' button 2015-12-09 13:52:13 +01:00
Robert Speicher
e6668f8e34 Merge branch 'edit-in-patch-branch' into 'master'
Default target branch to patch-n when editing file in protected branch

Fixes #3441

See merge request !2021
2015-12-08 22:04:52 +00:00
Douwe Maan
57d71520bd Make tooltip less confusing 2015-12-08 22:30:40 +01:00
Douwe Maan
82ddd738b6 Show tooltip when trying to edit file when not on branch 2015-12-08 17:10:07 +01:00
Douwe Maan
6789bd25ef Make tree view "Add file" button smaller 2015-12-02 14:59:04 +01:00
Douwe Maan
7b26414c15 Split up projects/tree/_tree partial. 2015-10-17 19:17:13 +02:00