Commit Graph
15 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 8527e8d599 Fix test for creating group from dashboard 2015-03-10 15:19:28 -07:00
Dmitriy Zaporozhets 519ca7bae9 Merge branch 'link-to-button' of https://github.com/cirosantilli/gitlabhq into cirosantilli-link-to-button
Conflicts:
	app/views/shared/_issuable_filter.html.haml
2015-03-02 15:28:22 -08:00
Douwe Maan 0283fff591 Merge branch 'master' into extend_markdown_upload
# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb
2015-02-24 14:54:39 +01:00
Douwe Maan 4ef6ffaad3 Split up AttachmentUploader. 2015-02-20 15:19:50 +01:00
Dmitriy Zaporozhets 8184a65644 Revert "Fix broken access control and refactor avatar upload"
This reverts commit 7d5f86f6cb.
2015-02-19 08:57:35 -08:00
Hannes RosenöggerandDouwe Maan 7d5f86f6cb Fix broken access control and refactor avatar upload
This commit moves the note folder from
/public/uploads/note
to
/uploads/note
and changes the uploader accordingly.
Now it's no longer possible to avoid the access control by modifing the url.
The Avatar upload has been refactored to use an own uploader as well
to cleanly seperate the two upload types.
2015-02-16 20:10:15 +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 bbca6a0abd Refactor sorting in project 2015-02-05 19:15:05 -08:00
Sytse Sijbrandij 7b233ea853 Spelling improvement, add in a group, not into group. 2015-02-03 16:55:31 -08:00
Ciro Santilli 55d9809055 Convert Javascript links to buttons. 2015-01-17 19:50:41 +01:00
Dmitriy Zaporozhets b8bffc0da2 Dont check for milestone description on group milestone page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-27 17:48:10 +02:00
Dmitriy Zaporozhets 5cf2bd4c99 Merge branch 'project-path' into 'master'
Project path

Fixes gitlab/gitlabhq#1781, gitlab/gitlabhq#1763

See merge request !1337
2014-12-24 13:27:26 +00:00
Dmitriy Zaporozhets 3eb586c12c Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-22 17:18:53 +02:00
Dmitriy Zaporozhets 1f2628fe21 Allow Group path to be changed at the same time as name
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-22 15:02:47 +02:00
Ciro Santilli fa34901237 Make Spinach test names consistent
- do not add Feature to feature titles
- titleize feature titles
- put steps on the same path as .feature files
- make feature titles match their path
2014-10-05 18:21:11 +02:00