diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-17 09:46:51 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-17 09:46:51 +0000 |
| commit | 7527408ad0c72ea7b7aba5c14550c5b08b6aae60 (patch) | |
| tree | f6d3bbc1ce73f1200be80e6392782b57dfc8abc5 /lib/api/files.rb | |
| parent | dba982403b7b894d2096ea61b89a247060eefe57 (diff) | |
| parent | 1c4870c54a9292ce4b4f1cfa553a5cbf21135deb (diff) | |
| download | gitlab-ce-7527408ad0c72ea7b7aba5c14550c5b08b6aae60.tar.gz | |
Merge branch 'feature/base64_content' into 'master'
Feature: base64 encoding for blob content
Diffstat (limited to 'lib/api/files.rb')
| -rw-r--r-- | lib/api/files.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/files.rb b/lib/api/files.rb index 6a5419a580f..8e87ae52e64 100644 --- a/lib/api/files.rb +++ b/lib/api/files.rb @@ -18,7 +18,7 @@ module API # post ":id/repository/files" do required_attributes! [:file_path, :branch_name, :content, :commit_message] - attrs = attributes_for_keys [:file_path, :branch_name, :content, :commit_message] + attrs = attributes_for_keys [:file_path, :branch_name, :content, :commit_message, :encoding] branch_name = attrs.delete(:branch_name) file_path = attrs.delete(:file_path) result = ::Files::CreateContext.new(user_project, current_user, attrs, branch_name, file_path).execute @@ -48,7 +48,7 @@ module API # put ":id/repository/files" do required_attributes! [:file_path, :branch_name, :content, :commit_message] - attrs = attributes_for_keys [:file_path, :branch_name, :content, :commit_message] + attrs = attributes_for_keys [:file_path, :branch_name, :content, :commit_message, :encoding] branch_name = attrs.delete(:branch_name) file_path = attrs.delete(:file_path) result = ::Files::UpdateContext.new(user_project, current_user, attrs, branch_name, file_path).execute |