home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
1930 Commits
Author SHA1 Message Date
Douwe Maan ad6d623234 Add Bitbucket importer. 2015-02-24 15:07:24 +01: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
Valery Sizov 71a844cdae Web Editor: save to new branch 2015-02-24 11:43:20 +02:00
Dmitriy Zaporozhets 897a2de54c Allow non authenticated access to avatars 2015-02-23 19:35:42 -08:00
DJ Mountney 746dd89ab0 Fix 404 when deleting a project 
The deletion from the admin section was redirecting to the wrong address.
 2015-02-23 16:19:03 -08:00
Dmitriy Zaporozhets 9459e9db24 Fix updating issue 500 error 2015-02-22 22:26:09 -08: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 aba1251594 Merge branch 'master' into extend_markdown_upload 2015-02-21 13:46:58 +01:00
Dmitriy Zaporozhets 5484acd998 Merge branch 'empty-project-redirect-vs-404' into 'master' 
Redirect from /tree/master on empty repo instead of showing 404.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/1114

See merge request !1559
 2015-02-21 02:01:21 +00:00
Marin Jankovski 8ae3112b3f Merge branch 'upload-xss-access-control' into 'master' 
Fix note attachments XSS and access control

Replaces the reverted #1528, as proposed in https://gitlab.com/gitlab-org/omnibus-gitlab/issues/434, as discussed with @dzaporozhets and as summarized in #2032.

@marin Could you take a look at the nginx config and apply it to Omnibus once this gets merged?

See merge request !1553
 2015-02-20 22:47:54 +00:00
Marcin Kulik 157b4b4b1f Add gitorious.org importer 2015-02-20 17:42:58 +00: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
Douwe Maan 938a1381fc Satisfy Rubocop. 2015-02-20 16:04:03 +01:00
Douwe Maan 7f1adc3d9c Fix URL to uploaded file. 2015-02-20 16:01:37 +01:00
Douwe Maan 218283b368 Merge branch 'extend_markdown_upload' into generic-uploads 
# Conflicts:
#	app/controllers/files_controller.rb
#	app/controllers/projects/uploads_controller.rb
#	app/uploaders/attachment_uploader.rb
 2015-02-20 15:37:37 +01:00
Douwe Maan c801df81fb Satisfy Rubocop. 2015-02-20 14:39:35 +01:00
Douwe Maan 00ca490259 Use controllers to serve uploads, with XSS prevention and access control. 2015-02-20 13:13:48 +01:00
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9 
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
 2015-02-19 20:53:05 -07: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
Dmitriy Zaporozhets 7c3147e6e9 Revert "Nitpicking." 
This reverts commit ebd39fc082.
 2015-02-19 08:57:33 -08:00
Dmitriy Zaporozhets 86d5e20664 Respect star ordering on explore page 2015-02-18 16:40:22 -08:00
Dmitriy Zaporozhets 2f0a764d31 Fix user page performance and authorization 2015-02-18 13:28:24 -08:00
Dmitriy Zaporozhets 63f11a68c5 Fix event loading with associations 2015-02-18 09:38:46 -08:00
Dmitriy Zaporozhets a8a328b151 DB performance improvements to GitLab 2015-02-18 00:16:42 -08:00
Dmitriy Zaporozhets 70edf950fe Show contributed projects on user page and stars for it 2015-02-17 22:40:00 -08:00
Douwe Maan d2ebdf664b Refactor. 2015-02-17 22:23:31 +01:00
Hannes RosenöggerandDouwe Maan 9729cc584f implement Project::UploadsController 2015-02-17 22:21:13 +01:00
Hannes RosenöggerandDouwe Maan 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
Dmitriy Zaporozhets 55a906f643 Merge branch 'fix_access_control_notes' into 'master' 
Fix broken access control for note attachments

From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/332 by Hannes Rosenögger.

See merge request !1528
 2015-02-17 18:05:12 +00:00
Dmitriy Zaporozhets 9eef14279f Merge branch 'oauth-dup' into 'master' 
Fix duplicate authorized applications

On the profile applications page, display one row per authorized app instead of one row per access token.  See #1987.

cc @sytse

See merge request !1524
 2015-02-16 23:08:50 +00:00
Douwe Maan ebd39fc082 Nitpicking. 2015-02-16 20:10:15 +01: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 e0f61a59b4 Use shorter map() syntax 2015-02-15 20:50:53 -07:00
Dmitriy Zaporozhets 2ad00f5294 Merge branch 'tweet-new-project' 
Conflicts:
	db/schema.rb
 2015-02-15 19:03:10 -08:00
Vinnie Okada 49d5099352 Avoid duplicate application rows 
Iterate over authorized applications instead of tokens to avoid multiple
rows for the same authorized app.
 2015-02-14 19:46:39 -07: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 f91767db3d Merge branch 'oauth-password-http' into 'master' 
Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S)

See #1982.

![Screen Shot 2015-02-13 at 13.37.28](https://dev.gitlab.org/uploads/gitlab/gitlabhq/69fe527252/Screen_Shot_2015-02-13_at_13.37.28.png)

There's a similar tooltip for SSH: "Add an SSH key to your profile to pull or push via SSH". These are always shown on-hover, even if the persistent flash above was hidden.

cc @sytse

See merge request !1512
 2015-02-13 18:12:05 +00:00
Dmitriy Zaporozhets c676856f1b Merge branch 'test_settings' into 'master' 
Test settings for issue tracker service

This adds minimum logging and response when using "test settings" button when the service is enabled.

See merge request !1506
 2015-02-13 17:59:03 +00:00
Douwe Maan 25e44d0530 Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S). 2015-02-13 14:44:42 +01:00
Douwe Maan 34cc4c5982 Link head panel titles to relevant root page. 2015-02-13 14:31:51 +01:00
Douwe Maan ce08f919bf Add link to share via twitter to "created project" event. 2015-02-13 12:07:59 +01:00
Douwe Maan 07d05d2df7 Move all event creation to EventCreateService. 2015-02-13 12:02:58 +01:00
Marin Jankovski 1a89db5ffb Try to test settings added in the service. 2015-02-12 13:02:58 -08:00
Marin Jankovski e8271226b1 Use the service_name. 2015-02-12 10:57:08 -08:00
Marin Jankovski 9f33898f7a All services can have templates. 2015-02-12 09:19:55 -08:00
Marin Jankovski 6b4ddf2cc1 Add admin services templates. 2015-02-11 17:55:33 -08:00
Dmitriy Zaporozhets 3e4e5f7063 Merge branch 'improve-oauth-ux' into 'master' 
Improve OAuth UX

See merge request !1489
 2015-02-09 16:45:25 +00:00
Dmitriy Zaporozhets 0a34f2dcb5 Merge pull request #8580 from j0k3r/asana 
Add Asana service
 2015-02-08 01:12:41 -08:00
Dmitriy Zaporozhets 03c8bf39e1 When add new social account - redirect to accounts page and show notice message 2015-02-08 00:53:31 -08:00
Dmitriy Zaporozhets 3cd036e315 Merge branch 'notification_email' 
Conflicts:
	db/schema.rb
 2015-02-07 18:42:34 -08:00