diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-07 12:55:46 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-07 12:55:46 +0000 |
| commit | cc8c91a1183ebfc5bb252f5e7f3f09fc20546476 (patch) | |
| tree | b20c01f8a37413e401873e5fd1be5e07865b93ac /app/models/commit.rb | |
| parent | 0611a18964a998b6edc81ef9b469f9f70430e542 (diff) | |
| parent | 0ab6ca93aadaf08f65f36e7fbdb5b837bac6e160 (diff) | |
| download | gitlab-ce-cc8c91a1183ebfc5bb252f5e7f3f09fc20546476.tar.gz | |
Merge branch 'add-directory-feature' into 'master'
Add directory feature button
This MR adds the "Add directory" feature as described in #2557 and splits out the "Create file" and "Upload file" in a dropdown.
### Screenshots
Added branch capability to upload file form:
"Upload file" is no longer accessible from the "Create file" page. Users can now select a target branch in upload file as well.
Closes #2799: Fixes a bug where file modes were overwritten after a commit
Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files can no longer be overwritten in the "Create file" section.
Closes #2557
See merge request !1453
Diffstat (limited to 'app/models/commit.rb')
0 files changed, 0 insertions, 0 deletions