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
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
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
Jeroen van Baarsen
5a4ebfb47a
Fixed the Rails/ActionFilter cop
...
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-04-20 15:39:37 +02:00
Valery Sizov
71a844cdae
Web Editor: save to new branch
2015-02-24 11:43:20 +02:00
Vinnie Okada
2a9eed6620
Merge branch 'master' into rails-4.1.9
...
Conflicts:
app/views/projects/commits/_commit.html.haml
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue_context.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/show/_context.html.haml
2015-02-21 12:55:28 -07:00
Douwe Maan
00408f37e3
Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404.
2015-02-20 17:20:03 +01:00
Vinnie Okada
76aad9b76e
Upgrade to Rails 4.1.9
...
Make the following changes to deal with new behavior in Rails 4.1.2:
* Use nested resources to avoid slashes in arguments to path helpers.
2015-02-14 11:09:23 -07:00
Dmitriy Zaporozhets
cc39bca3fa
Rubocop: Style/AlignHash enabled
2015-02-02 21:15:44 -08:00
Dmitriy Zaporozhets
ed91378627
Fix blob controller rendering in case of errors
2015-01-26 15:12:13 -08:00
Dmitriy Zaporozhets
59b08942aa
Refactor blob controllers
2015-01-26 15:02:28 -08:00
Valery Sizov
6f34d40436
remove auth duplication
2014-11-05 11:04:08 +02:00
Dmitriy Zaporozhets
8ad9a75f88
Merge pull request #8030 from cirosantilli/factor-authorize
...
Factor authorize_push! and authorize_code_access!
2014-10-21 11:43:12 +03:00
Ciro Santilli
4d0d5e79ba
Factor authorize_push! and authorize_code_access!
...
with existing method_missing. Pattern already used extensively,
so let's be consistent and use it everywhere.
2014-10-13 21:31:49 +02:00
Ciro Santilli
2d23522107
Use :message key, not :error for File::Service.
2014-10-13 20:55:09 +02:00
skv
4e40800166
diff unfold
2014-08-14 15:48:14 +04:00
Marin Jankovski
005752e4c6
Check if blob or tree and redirect to the correct one.
2014-07-07 15:46:57 +02:00
Dmitriy Zaporozhets
237ddd6024
Improve authorization for new/edit blob pages
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-24 21:29:52 +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
Takuya Nishigori
e78b90ab1d
Fix messages typo
2013-12-16 17:57:50 +09:00
Dmitriy Zaporozhets
bd20ec1a34
Remove file from repository feature
...
After click on remove file button you will be asked for commit message
via modal window. After submitting modal form file will be removed from
repository
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-19 16:14:56 +02:00
Dmitriy Zaporozhets
970d86b7c5
Refactor blob finding
2013-10-01 20:34:41 +03:00
Dmitriy Zaporozhets
1d3f03fb69
Fix blob and repo stuff after gitlab_git v3
2013-10-01 18:26:55 +03:00
Dmitriy Zaporozhets
ae9dd62762
Update code to work with gitlab_git 3
2013-10-01 17:00:28 +03:00
Dmitriy Zaporozhets
2ed7cbfba4
Move projects controllers/views in Projects module
2013-06-23 19:47:22 +03:00