home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,812 Commits 48 Branches 340 Tags
dffa2fa9e92e37a664afa2807fd5b01fbbd87ef2
Commit Graph
982 Commits
Author SHA1 Message Date
Marin Jankovski 141168ad3c Change default number of unicorn workers to three. 2015-03-13 17:14:34 -07:00
Dmitriy Zaporozhets f29a7ce51f Merge branch 'markdown-smb-link' into 'master' 
Allow smb:// links in Markdown text.

As requested by Sam McLeod at https://gitlab.com/gitlab-org/gitlab-ce/issues/1184

See merge request !1669
 2015-03-12 03:57:52 +00:00
Dmitriy Zaporozhets b2f6567961 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-11 09:57:59 -07:00
Vyacheslav Slinko 61ed518781 Make email display name configurable 2015-03-11 11:04:23 +07:00
Dmitriy Zaporozhets 0414b2ae98 Remove projects page from dashboard 2015-03-10 16:03:37 -07:00
Douwe Maan ca9aca9279 Allow smb:// links in Markdown text. 2015-03-10 13:32:28 +01:00
Dmitriy Zaporozhets d36ee3190a Add starred projects page to dashboard 2015-03-09 14:12:03 -07:00
Dmitriy Zaporozhets 7e574a896b Merge branch 'dashboard-groups' into 'master' 
Move profile groups page to dashboard

For #2069

See merge request !1654
 2015-03-09 16:43:36 +00:00
Marin Jankovski 41913fcc09 Merge branch 'smtp_example_update' into 'master' 
Add link to smtp documentation.

Closes #2070

See merge request !1627
 2015-03-09 16:23:43 +00:00
Dmitriy Zaporozhets 9b3e156e43 Move profile groups page to dashboard 2015-03-08 17:03:30 -07:00
Dmitriy Zaporozhets b5c3e1a431 Add GitLab UI development kit 2015-03-08 14:46:22 -07:00
Dmitriy Zaporozhets d07b2e09fe Merge branch 'timeout' into 'master' 
Increase timeout for Git-over-HTTP requests.

Fixes #2081 and https://gitlab.com/gitlab-org/gitlab-ce/issues/232.

Normal web requests are bound by the `Rack::Timeout` timeout of 60 seconds, while Grack Git-over-HTTP requests are only bound by Unicorn's timeout which is now set to 1 hour, which should be plenty.

The omnibus package should be updated to no longer use `unicorn['worker_timeout']` for the Unicorn timeout, but to set the `Slowpoke.timeout`.

See merge request !1619
 2015-03-05 02:28:58 +00:00
Douwe Maan 516bcabbf4 Increase timeout for Git-over-HTTP requests. 2015-03-04 23:20:47 +01:00
Marin Jankovski 890f14786a Add link to smtp documentation. 2015-03-04 09:04:23 -08:00
Douwe Maan fbc3cb69c3 Add dashboard milestones. 2015-03-03 16:19:37 +01:00
Dmitriy Zaporozhets eb865c43d0 Merge pull request #8349 from divineforest/cleanup-assets-compress 
Remove useless `assets.compress` option, Rails 4 uses only `assets.js_co...
 2015-03-02 15:23:57 -08:00
Douwe Maan ff69685607 Add comment about note attachment redirect. 2015-02-28 17:02:57 +01:00
Douwe Maan 7202db072f Redirect old note attachment path to new uploads path. 2015-02-27 11:26:47 +01:00
Dmitriy Zaporozhets 0d884ff2b1 Merge branch 'extend_markdown_upload' into 'master' 
Generalizes image upload in drag and drop in markdown to all files

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

- [x] Rebase on master when !1553 is merged in

See merge request !1530
 2015-02-25 23:36:03 +00:00
Douwe Maan 16c767814a Re-enable rescuing from Bitbucket OAuth errors. 2015-02-24 15:07:25 +01:00
Douwe Maan f2b37de54b Fix specs. 2015-02-24 15:07:24 +01:00
Douwe Maan 448817c4de Load public key in initializer. 2015-02-24 15:07:24 +01:00
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
Dmitriy Zaporozhets 9f9a79abe0 Merge pull request #8782 from jvanbaarsen/no-test-class-caching 
Don't cache classes in tests
 2015-02-23 23:47:23 -08:00
Marin Jankovski b0dfe434c6 Using gitlab url to build links for gitlab issue tracker and add a spec. Fix rubocop warnings in path. 2015-02-23 18:43:26 -08:00
Dmitriy Zaporozhets b821a1bd41 Fix markdown image uploader after rails update 2015-02-23 16:29:32 -08:00
Dmitriy Zaporozhets c6860a5828 Fix style issue for rubocop 2015-02-23 15:18:45 -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 452ba19cdd Change check to only swap static middleware when it's enabled. 2015-02-21 15:09:17 +01:00
Douwe Maan aba1251594 Merge branch 'master' into extend_markdown_upload 2015-02-21 13:46:58 +01: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
Douwe Maan 6945f4a299 Explain Gitlab::Middleware::Static. 2015-02-20 23:30:06 +01:00
Marcin Kulik 157b4b4b1f Add gitorious.org importer 2015-02-20 17:42:58 +00:00
Douwe Maan 2570e4df79 Fix specs. 2015-02-20 16:55:38 +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
Douwe Maan 4310431ee7 Use modified ActionDispatch::Static to let uploads go through to routes. 2015-02-20 12:44:07 +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
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
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
Douwe Maan ce08f919bf Add link to share via twitter to "created project" event. 2015-02-13 12:07:59 +01:00
Jeroen van Baarsen d458e39e31 Don't cache classes in tests 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 13:47:23 +01:00
Marin Jankovski 6b4ddf2cc1 Add admin services templates. 2015-02-11 17:55:33 -08:00
Marin Jankovski 653be1fe8a Merge branch 'issue-closing-pattern' into 'master' 
Extend issue clossing pattern

New: "Resolve", "Resolves", "Resolved", "Resolving" and "Close"

Now matches those supported by [GitHub](https://help.github.com/articles/closing-issues-via-commit-messages/), with the addition of the -ing forms.

See merge request !1475
 2015-02-11 00:41:19 +00:00