summaryrefslogtreecommitdiff
path: root/app/services/files/update_service.rb
Commit message (Collapse)AuthorAgeFilesLines
* Fix specdm-fix-web-edit-new-linesDouwe Maan2017-02-241-1/+1
|
* Raise error when no content is providedDouwe Maan2017-02-241-0/+4
|
* Rename from base to start because base could mean merge baseLin Jen-Shin2017-01-061-3/+3
|
* Rename source to base to avoid confusion from MRLin Jen-Shin2017-01-061-3/+3
|
* Cleanup parameters, easier to understand andLin Jen-Shin2016-12-081-3/+3
| | | | more consistent across different methodst
* Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-11-241-2/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (141 commits) Log mv_namespace parameters Remove header ids from University docs Added test that checks the correct select box is there for the LFS enabled setting. Simplify copy on "Create a new list" dropdown in Issue Boards Fix `LFS enabled` select box. Use Commit#author so we share logic and cache Move admin abuse report spinach test to rspec fixes non-retina shadow and browser zoom issue Use default `closest` if available! Adds polyfill for CustomEvent Move abuse report spinach test to rspec Add support of Chrome/Chromium in requirements.md Fixed dragging issues on issue boards Grapify the sidekiq metrics API Add nested groups support to the routing Correctly determine mergeability of MR with no discussions API: Add endpoint to delete a group share Add a starting date to milestones Update ProjectTeam#fetch_members to use project authorizations Update ProjectTeam#max_member_access_for_user_ids to use project authorizations ...
| * Remove unnecessary require_relative calls from service classesSemyon Pupkov2016-11-221-2/+0
| | | | | | | | | | Rails by default use autoload for all dirs from app folder. require_relative not needed. See ActiveSupport::Dependencies.autoload_paths
* | Move all branch creation to raw_ensure_branch,Lin Jen-Shin2016-11-221-0/+1
| | | | | | | | and keep it only called in update_branch_with_hooks.
* | Add `source_branch` option for various git operationsLin Jen-Shin2016-11-151-1/+2
|/ | | | | | | | | | | | | If `source_branch` option is passed, and target branch cannot be found, `Repository#update_branch_with_hooks` would try to create a new branch from `source_branch`. This way, we could make changes in the new branch while only firing the hooks once for the changes. Previously, we can only create a new branch first then make changes to the new branch, firing hooks twice. This behaviour is bad for CI. Fixes #7237
* multi-file commitMarc Siegfriedt2016-10-051-6/+0
| | | | | | add docs and tests - add additional validation allow move without content updated response
* Add optional 'author' param when making commitsDan Dunckel2016-09-191-1/+3
|
* Prevents accidental overwrites of commits from UIFrank West2016-08-151-0/+23
| | | | | | | | | | | | | Currently when a user performs an update of a file through the UI and there has already been a change committed to the file the previous commits will be overwritten without a check to see if the file has been changed. This commit uses the last commit sha at the time the user starts editing the file and compares it with the current sha of the file being edited to ensure they are the same before committing the file. If the shas do not match we throw an exception preventing the commit from the commit from occurring. Fixes #5857
* fixes more issues for MR acceptancetiagonbotelho2016-07-121-2/+0
|
* refactors to pass values as arguments through optionstiagonbotelho2016-07-121-0/+1
|
* implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-121-0/+1
|
* fixes more issues for MR acceptancetiagonbotelho2016-07-121-2/+3
|
* refactors to pass values as arguments through optionstiagonbotelho2016-07-121-1/+0
|
* implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-121-0/+1
|
* creates the update_file method in repository.rb and applies changes accordinglytiagonbotelho2016-07-121-1/+0
|
* implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-121-0/+1
|
* refactors to pass values as arguments through optionstiagonbotelho2016-07-121-2/+3
|
* removes debugging prints from codetiagonbotelho2016-07-121-0/+1
|
* implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-121-1/+0
|
* creates the update_file method in repository.rb and applies changes accordinglytiagonbotelho2016-07-121-1/+1
|
* implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-121-0/+1
|
* Add directory feature buttonStan Hu2015-10-071-1/+1
| | | | | | | | | | | | | | | | | | 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
* Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-33/+3
| | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
* Revert "Create and edit files in web editor via rugged"Dmitriy Zaporozhets2015-08-111-17/+7
| | | | | | This reverts commit 734a4ba87de7bc8cf152c5bc7f93ba04210b282d. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Revert "Use rugged in web editor for base64 encoding"Dmitriy Zaporozhets2015-08-111-14/+17
| | | | This reverts commit 541133197be098732cdc14a12aa059e21cac3d71.
* Revert "Create activity event and execute hooks on web editor commit"Dmitriy Zaporozhets2015-08-111-2/+1
| | | | This reverts commit 3d416f1682c5e6a6ac1ea7013f66bbd0d23b452c.
* Revert "Make web editor work correctly after switch from satellites"Dmitriy Zaporozhets2015-08-111-1/+1
| | | | This reverts commit 435f680b897b892103fa157d4699dbb6d9ecf758.
* Revert "Refactor web editor"Dmitriy Zaporozhets2015-08-111-2/+40
| | | | | | This reverts commit dfccb06dda344819989fa8d6a9a3c56c5ca0b65f. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor web editorrefactor-web-editorDmitriy Zaporozhets2015-06-051-40/+2
| | | | | | | | | | * fix problem with editing non-master branch * before commit make sure branch exists * dont allow user change file in one branch and commit to another existing branch * remove a lot of code duplication * remove outdated statellite errors Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Make web editor work correctly after switch from satellitesDmitriy Zaporozhets2015-06-021-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Create activity event and execute hooks on web editor commitDmitriy Zaporozhets2015-06-021-1/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Use rugged in web editor for base64 encodingDmitriy Zaporozhets2015-06-011-17/+14
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Create and edit files in web editor via ruggedDmitriy Zaporozhets2015-06-011-7/+17
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor GitAccess to use instance variables.Douwe Maan2015-03-241-1/+1
|
* Web Editor: save to new branchValery Sizov2015-02-241-1/+2
|
* Improve error messages when file editing failsVinnie Okada2015-02-221-6/+8
| | | | | Give more specific errors in API responses and web UI flash messages when a file update fails.
* developer can push to protected branchesValery Sizov2015-01-201-5/+1
|
* Add comments.Sytse Sijbrandij2014-08-061-1/+1
|
* Make file edit error message less specificJacob Vosmaer2014-08-061-1/+1
| | | | | The truth is that at the point where there error message is written we can only guess what went wrong.
* Repository#blob_at_branchDmitriy Zaporozhets2014-02-051-2/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix blobs for file servicesDmitriy Zaporozhets2014-02-051-1/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'refactoring/context_into_services' into 'master'Dmitriy Zaporozhets2014-01-171-3/+4
| | | | | | Refactoring context Into services To prevent confusion where to write logic. Context or Service?
* Fix require for file servicesDmitriy Zaporozhets2014-01-161-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move all Context classes into ServicesDmitriy Zaporozhets2014-01-161-0/+39
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status