home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,661 Commits 48 Branches 340 Tags
31e28ebcebc054eaeef2eddba64ff2ff7ca3104f
Commit Graph
44 Commits
Author SHA1 Message Date
Douwe Maan d9c82d679f Automatically fork a project when not allowed to edit a file. 2015-12-18 10:03:34 +01:00
Douwe Maan 57d71520bd Make tooltip less confusing 2015-12-08 22:30:40 +01:00
Douwe Maan 82ddd738b6 Show tooltip when trying to edit file when not on branch 2015-12-08 17:10:07 +01:00
Rubén Dávila 5145706c82 Run custom Git hooks when creating or deleting branches through the UI. #1156 2015-12-03 09:39:15 -05:00
Ben FordandDouwe Maan 3be9d2c422 Add ability to create directories in the editor 
Simply type a name with a `/` directory separator and new directories
will be created. This does not do the fancy UI work that github.com
does, but it will get the job done.

I could not find tests for file creation, so I didn't add a test for
this slight behaviour modification. I did test directory traversals
though, using both absolute paths like `/tmp/foo.txt` and relative paths
like `../../foo.txt`. Neither case escaped the repository, though
attempting to traverse with a relative path resulted in a 500 error that
did not affect application stability upon reload.
 2015-10-29 15:49:07 +01:00
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
Guilherme Garnier 2b075f16c7 Fix rubocop warnings in app 2015-10-03 00:56:37 -05:00
liyakun e2ece2bc35 Add "Replace" and "Upload" features 
Refactor upload and replace functionality

    Rename file and move CSS

    Fix typo

    Make dropzone a div

    Remove unnecessary file

    Change color of "upload existing one"

    Add missing changes
 2015-09-15 02:12:56 +02:00
Dmitriy Zaporozhets f4149bcddc Refactor how repository makes commit with pre/post receive hooks 2015-08-14 16:23:40 +02:00
Dmitriy Zaporozhets c8614cbbe7 Capture pre-receive exception 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-13 14:29:13 +02:00
Dmitriy Zaporozhets 34690142bf Implement commit transaction with pre-receive and post-receive hooks for web editor 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-13 12:57:24 +02: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 9d029a05f1 Revert "Merge branch 'web-editor-rugged' into 'master'" 
This reverts commit 5a1aa49b55, reversing
changes made to a675bea2c1.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 13:04:38 +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 0806605962 Revert "Fix adding new file to empty repo" 
This reverts commit 27a158506e.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 11:51:26 +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 9f10943c1a Revert "Merge branch 'drop-satellites'" 
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 10:28:42 +02:00
Dmitriy Zaporozhets a7fded9b95 Huge refactoring for accepting merge requests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-16 16:03:07 +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 8997812626 Remove files in web editor using rugged 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-02 11:41:21 +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 27a158506e Fix adding new file to empty repo 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 21:17:13 +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 dfe0f9eedf Use more specific regexes. 2015-03-27 11:09:29 +01: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
Dmitriy Zaporozhets 3e47ea5064 Files::CreateService can now commit file to empty repository 2015-01-26 13:31:24 -08:00
Valery Sizov ab7a79bf3b developer can push to protected branches 2015-01-20 17:34:23 -08:00
Ciro Santilli 2d23522107 Use :message key, not :error for File::Service. 2014-10-13 20:55:09 +02:00
Ciro Santilli ad47993ac4 Factor error and success methods from services. 2014-09-21 11:43:05 +02: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
Ciro Santilli b1c40e8151 Fix username validation message to match regexp. 
Also used for project, group and web ui new file names.
 2014-06-26 13:31:34 +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