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
9729cc584f
implement Project::UploadsController
2015-02-17 22:21:13 +01:00
Hannes Rosenögger
ca504a77fe
Fix tests
2015-02-17 22:20:44 +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
Dmitriy Zaporozhets
58011d61c3
Merge branch 'prepare-fork-to-given-namespace' of https://gitlab.com/bkaindl/gitlab-ce into bkaindl/gitlab-ce-prepare-fork-to-given-namespace
2014-11-13 19:36:28 +02:00
Bernhard Kaindl
84fbd29351
transfer_service_spec: cleanup, merge common code, check against nil
...
- replace creation of group2 with the use of group without add_owner(user)
- fold TransferService calls into new test function transfer_project
- remove currently not used (and not working) gitlab_shell stub
(will submit testcase simulating failure in gitlab_shell separately)
- add checks against not be_nil (result.should be_false passes even if nil)
2014-10-04 12:29:24 +02:00
Bernhard Kaindl
c44764f523
Prepare ForkService to support forking projects to given namespaces
...
Remove overload of BaseService.initialize, so initialize gains params,
which is used to pass the namespace (like e.g. in TransferService).
The namespace is checked for permission to create projects in it.
2014-10-03 11:52:29 +02:00
Job van der Voort
68fd66c6e3
block visibility level restriction override in controller
2014-08-28 20:33:41 +02:00
Dmitriy Zaporozhets
2e497d8438
Prevent project stars duplication when fork project
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-25 12:19:52 +03:00
Dmitriy Zaporozhets
4967c08786
Fix signup and project visibility
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-30 16:43:32 +03:00
Dmitriy Zaporozhets
f0de4b539f
Fix project update specs
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-27 00:28:32 +03:00
Dmitriy Zaporozhets
73f91da8b1
Fix project deletion and tests
2014-06-17 23:49:17 +03:00
Dmitriy Zaporozhets
2d87556847
Remove rails observers from application
2014-06-17 22:51:43 +03:00
Dmitriy Zaporozhets
d593c98fcb
Delete wall notes tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-13 14:29:26 +03:00
Dmitriy Zaporozhets
14f78d067d
Modify specs for new project transfer code
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-28 19:04:18 +03:00
Marin Jankovski
43e7b8fa07
Remove empty space
2014-05-26 15:55:41 +02:00
Marin Jankovski
f8a6d3405e
Add image_service spec.
2014-05-26 15:47:54 +02:00
Dmitriy Zaporozhets
1bd28994cc
Use ProjectWiki instead of GollumWiki in code
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-09 14:35:58 +03:00
Robert Speicher
07833d1676
Move Project's service specs to the correct location
...
[ci skip]
2014-03-22 16:38:22 -04:00
