Commit graph

14 commits

Author SHA1 Message Date
GitLab Bot
4c5468b408 Add latest changes from gitlab-org/gitlab@master 2020-06-24 15:08:50 +00:00
Thong Kuah
85b29c1c2f Add frozen_string_literal to spec/services
Probably useful as we often move these files to "new" files.
2019-04-12 10:14:54 +12:00
Patrick Bajao
de5aef3bbd Accept force option on commit via API
When `force` is set to `true` and `start_branch` is set, the
branch will be ovewritten with the new commit based on the
`HEAD` of the `start_branch`.

This commit includes changes to update the `gitaly-proto` gem.
2019-03-06 10:44:59 +00:00
Nick Thomas
14076062df
Commits API: Preserve file content in move operations if unspecified 2018-11-28 11:50:05 +00:00
Jacopo
271776d4aa Adds chmod action to POST /projects/:id/repository/commits API
With this action the user can update the execute_filemode of a given file in the repository.
2018-09-27 11:51:15 +02:00
Mark Chao
a63bce1a4b Resolve "Rename the Master role to Maintainer" Backend 2018-07-11 14:36:08 +00:00
James Edwards-Jones
c1e3942122 Extract constant for LfsPointerFile::VERSION_LINE 2018-03-16 13:35:03 +00:00
James Edwards-Jones
1f5e809c04 Use correct encoding with Lfs::FileTransfromer 2018-03-15 21:49:01 +00:00
James Edwards-Jones
1baac92112 Multi-file upload and Commit API obey LFS filters
Updates Files::MultiService for the commits API which is in turn used by the
multi-file upload web UI

Ensures that files which should be in LFS are transformed into LFS pointers
Uses Lfs::Transformer which then links LfsObjectProjects on success
2018-03-15 02:39:08 +00:00
Alejandro Rodríguez
0b07be594e Move git operations for multi_action into Gitlab::Git 2018-01-05 15:17:53 -03:00
blackst0ne
27c95364b5 Replace '.team << [user, role]' with 'add_role(user)' in specs 2017-12-22 19:18:28 +11:00
Rubén Dávila
c927e57466 Updates from last code review:
- Apply some refactoring for code reuse
- Add file status validation for Files::DeleteService
- Write additional specs
2017-12-20 10:57:27 -05:00
Rubén Dávila
c210ddab92 Check if file has been modified for each action provided.
When commiting multiple files we're now checking if any of those files
has been modified by another commit and we're rejecting the new commit
in this case.
2017-12-20 01:24:53 -05:00
Rubén Dávila
81331fa77e Add some initial specs for Files::MultiService class 2017-12-20 01:24:53 -05:00