diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-09-17 08:45:22 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-10-07 14:22:55 +0300 |
| commit | 0ab6ca93aadaf08f65f36e7fbdb5b837bac6e160 (patch) | |
| tree | b20c01f8a37413e401873e5fd1be5e07865b93ac /app/services/merge_requests/merge_service.rb | |
| parent | 0611a18964a998b6edc81ef9b469f9f70430e542 (diff) | |
Add directory feature button
Change "+" icon under "Files" section to have three options:
* Create file
* Upload file
* New directory
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
Diffstat (limited to 'app/services/merge_requests/merge_service.rb')
| -rw-r--r-- | app/services/merge_requests/merge_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index fcc0f2a6a8d..7963af127e1 100644 --- a/app/services/merge_requests/merge_service.rb +++ b/app/services/merge_requests/merge_service.rb @@ -29,7 +29,7 @@ module MergeRequests private def commit - committer = repository.user_to_comitter(current_user) + committer = repository.user_to_committer(current_user) options = { message: commit_message, |