home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,122 Commits 48 Branches 340 Tags
fe2b98ab0bee618aa2af25f5fed53780997d9cd2
Commit Graph
1501 Commits
Author SHA1 Message Date
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
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
Douwe Maan 9dbd7e5aec Allow notification email to be set separately from primary email. 
Closes #1932.
 2015-02-07 23:19:17 +01:00
Dmitriy Zaporozhets 89f8020fe1 Merge branch 'mention-groups' 
Conflicts:
	CHANGELOG
 2015-02-06 16:45:37 -08:00
Dmitriy Zaporozhets dd8dd92e50 Merge branch 'api-default-order' into 'master' 
Sorting refactoring

* refactor sorting logic for web UI
* refactor and document ordering for API: project, issues, merge requests
* explicitly define ordering in models using default_scope

See merge request !1476
 2015-02-06 18:08:44 +00:00
Valery Sizov b3c90dd514 GitHub importer refactoring 2015-02-05 21:48:21 -08:00
Dmitriy Zaporozhets 8952fc015f Apply default scope to labels and remove one for notes 2015-02-05 20:29:41 -08:00
Dmitriy Zaporozhets bbca6a0abd Refactor sorting in project 2015-02-05 19:15:05 -08:00
Valery Sizov 1ac20698a5 gitlab.com importer: refactorig 2015-02-05 17:03:43 -08:00
Dmitriy Zaporozhets 62ed1c537e Explicitly define ordering in models using default_scope 2015-02-05 14:20:55 -08:00
Valery Sizov 592ed8738c Gitlab.com integration: code folding 2015-02-05 12:50:34 -08:00
Valery Sizov 33349dd549 GitLab.com integration: refactoring 2015-02-05 12:50:34 -08:00
Valery Sizov 18231b0bb3 GitLab.com integration: refactoring 2015-02-05 12:50:34 -08:00
Valery Sizov 5194214e3a GitLab integration. Importer 2015-02-05 12:50:34 -08:00
Douwe Maan 9910b7ff99 Allow groups to be mentioned. 
Resolves #1673.
 2015-02-05 19:10:52 +01:00
Dmitriy Zaporozhets 0a9cab4ee6 Merge branch 'dont-download-image-attachments' 
Conflicts:
	CHANGELOG
 2015-02-05 09:54:38 -08:00
Douwe Maan ab22caa97e Redirect signup page to signin page. 
Resolves #1916.
 2015-02-05 15:56:28 +01:00
Douwe Maan f4ce0ddde4 Show image attachments in browser instead of downloading them. 
Resolves #1702.
 2015-02-04 15:35:10 +01:00
Dmitriy Zaporozhets 635ebac606 Merge branch 'master' into mwessel/gitlab-ce-configure-protection 2015-02-03 17:54:33 -08:00
Valery Sizov b9d9ac82a9 Commit page: async load branches info 
Conflicts:
	config/routes.rb
 2015-02-03 09:10:56 -08:00
Dmitriy Zaporozhets 61cc6a9244 Rubocop: indentation fixes Yay!!! 2015-02-02 21:59:28 -08:00
Dmitriy Zaporozhets d04344373b Rubocop: no trailing newlines 2015-02-02 21:53:27 -08:00
Dmitriy Zaporozhets 647ff6240e Rubocop: Style/ElseAlignment enabled 2015-02-02 21:38:50 -08:00
Dmitriy Zaporozhets cc39bca3fa Rubocop: Style/AlignHash enabled 2015-02-02 21:15:44 -08:00
Dmitriy Zaporozhets e890582681 Rubocop enabled for: Use spaces inside hash literal braces 2015-02-02 20:36:54 -08:00
Dmitriy Zaporozhets 4f1d1fc51b Convert hashes to ruby 1.9 style 2015-02-02 19:30:09 -08:00
Jeremy 3cd1eda5a4 Add restrict_to_branch to service controller 
And add restrict_to_branch to spec
 2015-02-02 09:59:42 +01:00
Dmitriy Zaporozhets f1cf49218f Improve contribution calendar on user page 
* cache user contributions for day
* ignore forks in calendar contribtuions
 2015-01-29 17:07:44 -08:00
Marco Wessel 20e269cb92 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into configure-protection 
Conflicts:
	CHANGELOG
	db/schema.rb
 2015-01-30 00:16:24 +01:00
Dmitriy Zaporozhets 08582f1532 Improve user calendar authentification and tests 2015-01-29 08:55:57 -08:00
Dmitriy Zaporozhets 1f0e16569f Load contribution calendar via AJAX 2015-01-29 01:20:17 -08:00