Commit Graph

23 Commits

Author SHA1 Message Date
Stan Hu 0ab6ca93aa 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
2015-10-07 04:22:55 -07:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' "
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets 9bc512314a
Revert "Create and edit files in web editor via rugged"
This reverts commit 734a4ba87d.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 11:52:33 +02:00
Dmitriy Zaporozhets 815e678c4e Revert "Use rugged in web editor for base64 encoding"
This reverts commit 541133197b.
2015-08-11 11:50:48 +02:00
Dmitriy Zaporozhets 34975f0180 Revert "Create activity event and execute hooks on web editor commit"
This reverts commit 3d416f1682.
2015-08-11 11:50:43 +02:00
Dmitriy Zaporozhets 24332b7b99 Revert "Make web editor work correctly after switch from satellites"
This reverts commit 435f680b89.
2015-08-11 11:49:29 +02:00
Dmitriy Zaporozhets d4cfa0bf76
Revert "Refactor web editor"
This reverts commit dfccb06dda.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 11:49:09 +02:00
Dmitriy Zaporozhets dfccb06dda
Refactor web editor
* 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>
2015-06-05 15:01:38 +02:00
Dmitriy Zaporozhets 435f680b89
Make web editor work correctly after switch from satellites
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-02 12:06:40 +02:00
Dmitriy Zaporozhets 3d416f1682
Create activity event and execute hooks on web editor commit
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-02 10:45:13 +02:00
Dmitriy Zaporozhets 541133197b
Use rugged in web editor for base64 encoding
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-01 23:43:35 +02:00
Dmitriy Zaporozhets 734a4ba87d
Create and edit files in web editor via rugged
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-01 20:49:11 +02:00
Douwe Maan 4830b2be5e Refactor GitAccess to use instance variables. 2015-03-24 14:11:48 +01:00
Valery Sizov 71a844cdae Web Editor: save to new branch 2015-02-24 11:43:20 +02:00
Vinnie Okada 5f232b5687 Improve error messages when file editing fails
Give more specific errors in API responses and web UI flash messages
when a file update fails.
2015-02-22 16:01:49 -07:00
Valery Sizov ab7a79bf3b developer can push to protected branches 2015-01-20 17:34:23 -08:00
Sytse Sijbrandij 43f560b174 Add comments. 2014-08-06 17:44:57 +02:00
Jacob Vosmaer 11d5ad2f17 Make file edit error message less specific
The truth is that at the point where there error message is written we
can only guess what went wrong.
2014-08-06 14:27:22 +02:00
Dmitriy Zaporozhets 55572c4e86
Repository#blob_at_branch
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-05 11:39:55 +02:00
Dmitriy Zaporozhets fc16a228c9
Fix blobs for file services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-05 09:02:13 +02:00
Dmitriy Zaporozhets f0d2d28118 Merge branch 'refactoring/context_into_services' into 'master'
Refactoring context Into services

To prevent confusion where to write logic. Context or Service?
2014-01-17 09:47:47 +00:00
Dmitriy Zaporozhets 4d82e9ed0b
Fix require for file services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-16 20:36:51 +02:00
Dmitriy Zaporozhets 1d2bdb4d58
Move all Context classes into Services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-16 19:03:42 +02:00