Commit graph

12 commits

Author SHA1 Message Date
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
d2ebdf664b Refactor. 2015-02-17 22:23:31 +01:00
Hannes Rosenögger
192e730662 Fix tests 2015-02-17 22:21:13 +01:00
Hannes Rosenögger
9bf8480b4a Generalize the image upload in markdown
This commit generalizes the image upload via drag and drop so it supports all files.
It also adds access control for these files.
2015-02-17 22:20:44 +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
Jeroen van Baarsen
0c4a70a306 Updated rspec to rspec 3.x syntax
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-02-12 19:17:35 +01:00
Ciro Santilli
9b5c7a4d60 Add star count, view logic, more tests. 2014-07-17 22:47:16 +02:00
Ciro Santilli
714f7201d3 Add project stars. 2014-07-17 22:47:16 +02:00
Marin Jankovski
9b2a13497d Need txt file in test. 2014-05-26 15:58:03 +02:00
Marin Jankovski
f8a6d3405e Add image_service spec. 2014-05-26 15:47:54 +02:00
Marin Jankovski
8bec6b0bcb Make existing tests test something, return correct errors. 2014-05-26 14:17:46 +02:00
Earle Bunao & Neil Calabroso
6a85cdf162 Implements drag and drop upload in creating issues 2014-05-23 16:22:42 +08:00