Commit graph

27 commits

Author SHA1 Message Date
Stan Hu
208e07fe6f Fix errors deleting and creating branches with encoded slashes
Closes #1804
2015-08-01 23:33:33 -07:00
Stan Hu
4254f09eaa Return 40x error codes if branch could not be deleted in UI 2015-07-06 09:47:22 -07: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
Dmitriy Zaporozhets
f0cbbd70bb Use same constant for amount of items per page 2015-03-12 15:37:00 -07: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
Marin Jankovski
334fe86574 Sanitize branch name and ref name 2014-11-13 16:20:43 +01:00
Valery Sizov
6f34d40436 remove auth duplication 2014-11-05 11:04:08 +02:00
Dmitriy Zaporozhets
961a6bfcc2
API delete branch: render branch name json instead of true
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-30 17:28:59 +02: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
ad47993ac4 Factor error and success methods from services. 2014-09-21 11:43:05 +02:00
Robert Schilling
551145bc98 Validate branch-names and references in WebUI, API
Add specs for GitRefValidator
2014-09-03 13:08:35 +02:00
Jeroen van Baarsen
4ac56fa1db Changed some stuff around after rebase 2014-05-23 20:26:31 +02:00
Jeroen van Baarsen
d0e794cc1a Make sure the branch counter gets updated
When you delete a branch, the counters wont get updated automaticly,
this happends because of the JS nature of the original call. I've
fixed this by responding with a JS file, and recalculate the counters.

Fixes: #6030
2014-05-23 20:23:59 +02:00
Dmitriy Zaporozhets
de7d93e31f Merge branch 'branch-creation-flow' into 'master'
Branch creation flow

To improve user experience with web editing I did next improvements:

* when create branch via ui - redirect to tree view so you start add/edit files
* when click on branch name - redirect to tree view instead of commits so you can immedialty add/edit files
2014-05-23 13:06:32 +00:00
Dmitriy Zaporozhets
695fd3cf2c
Move protected branches to Project settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-23 14:25:55 +03:00
Dmitriy Zaporozhets
a5e1624359
Redirect to tree view after branch created
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-23 13:27:35 +03:00
Dmitriy Zaporozhets
0455391add
Improve branch-removal logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-22 14:39:09 +03:00
Dmitriy Zaporozhets
95b84e2c5a
Move branch creation logic in service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-01 10:33:23 +03:00
Dmitriy Zaporozhets
88c741dde0 Refactor recent branches page 2013-08-05 17:59:58 +03:00
Dmitriy Zaporozhets
8587e3a357 create corresponding events when create branch/tag with UI 2013-07-17 15:11:03 +03:00
Dmitriy Zaporozhets
9ea5766c35 Improve permissions on tags/branches 2013-07-17 08:26:00 +03:00
Dmitriy Zaporozhets
cbe9f56afa Ability to create new branch via UI 2013-07-17 00:09:23 +03:00
Dmitriy Zaporozhets
132caae734 Move repo tags to own controller. add ability to remove tags 2013-07-16 23:12:52 +03:00
Dmitriy Zaporozhets
a165a0b23f Create event on dashboard when branch removed via UI 2013-07-16 22:43:14 +03:00
Dmitriy Zaporozhets
7a167cf1f7 Move branches list to own controller with pagination. Ability to remove branches from UI 2013-07-16 22:19:07 +03:00