Dmitriy Zaporozhets
9470675b4e
Merge branch 'projects-limit-default' into 'master'
...
Correctly set default projects limit for new users.
See #2014 .
Note that the projects limit still isn't retroactively applied to existing users (probably as intended)
See merge request !1547
2015-02-19 20:48:49 +00:00
Douwe Maan
1d6050104c
Correctly set default projects limit for new users.
2015-02-19 19:26:57 +01: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
716544085c
Get contributed projects for last year only
2015-02-18 15:16:13 -08:00
Dmitriy Zaporozhets
138aa81e60
Get contributed projects only if push event exists
2015-02-18 14:20:26 -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
Hannes Rosenögger and Douwe 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
Dmitriy Zaporozhets
ec5622b1a4
Merge branch 'user-account-created-email' into 'master'
...
Only send "Account was created for you" email when created by admin.
See #1985
cc @sytse
See merge request !1517
2015-02-16 03:08:48 +00:00
Dmitriy Zaporozhets
2ad00f5294
Merge branch 'tweet-new-project'
...
Conflicts:
db/schema.rb
2015-02-15 19:03:10 -08: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 .
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
4d9756c1e8
Merge branch 'username-namespace-clash' into 'master'
...
Prevent autogenerated OAuth username to clash with existing namespace.
If the OAuth username already exists as a group rather than a user, automatic account creation would still fail.
See merge request !1511
2015-02-13 18:08:53 +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
Dmitriy Zaporozhets
b8cc501c3e
Merge branch 'add_tracker_integration_doc' into 'master'
...
Add tracker integration doc and help page on service
Added documentation on how to enable tracker integration. Fix the active link on the admin page. Added help under the JIRA service page.
See merge request !1508
2015-02-13 17:57:39 +00:00
Douwe Maan
4a62a0f01a
Only send "Account was created for you" email when created by admin.
2015-02-13 15:30:54 +01: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
161d15541a
Prevent autogenerated OAuth username to clash with existing namespace.
2015-02-13 12:39:11 +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
9b917b4a73
Add "User created project Namespace / Project" event
2015-02-13 12:02:58 +01:00
Douwe Maan
522efa43fe
Refactor event title generation for more consistent messages.
...
Example: "User joined project Namespace / Project" rather than "User joined project at Namespace / Project"
2015-02-13 12:02:58 +01:00
Douwe Maan
07d05d2df7
Move all event creation to EventCreateService.
2015-02-13 12:02:58 +01:00
Marin Jankovski
eccf695640
Explained in the integration documentation how to enable external issue tracker
2015-02-12 17:06:55 -08:00
Dmitriy Zaporozhets
2ff1b8e68d
Merge branch 'clean-oauth-username' into 'master'
...
Clean username acquired from OAuth/LDAP.
Fixes #1967 .
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/813
See merge request !1500
2015-02-13 00:39:34 +00:00
Marin Jankovski
8a37435738
Fix rubocop error.
2015-02-12 13:21:47 -08:00
Marin Jankovski
1a89db5ffb
Try to test settings added in the service.
2015-02-12 13:02:58 -08:00
Douwe Maan
6685661b54
Clean username acquired from OAuth/LDAP.
...
Fixes #1967 .
2015-02-12 21:05:27 +01:00
Marin Jankovski
9f33898f7a
All services can have templates.
2015-02-12 09:19:55 -08:00
Marin Jankovski
b3f944a398
Annotate services. Add a link to service template.
2015-02-11 18:29:24 -08:00
Marin Jankovski
6b4ddf2cc1
Add admin services templates.
2015-02-11 17:55:33 -08:00
Marin Jankovski
09d3d351a1
Remove not null constraint on project_id in services.
2015-02-11 09:47:21 -08:00
Marin Jankovski
5515366064
Add template boolean to services.
2015-02-11 09:24:40 -08:00
Marin Jankovski
29e606deec
Add ExternalIssue base model to make issue referencing more robust for external issue trackers.
2015-02-11 09:21:57 -08:00
Dmitriy Zaporozhets
3c4f7f50fa
Merge branch 'add_label_notes' into 'master'
...
Add label notes
It creates system note, when someone changed labels of issue/MR.
Just look at the screenshot:
Solves this [request] (http://feedback.gitlab.com/forums/176466-general/suggestions/6623258-create-a-note-when-issue-labels-change ).
*P.S. Thanks this [PR](https://github.com/gitlabhq/gitlabhq/pull/8237 ) for idea 😉 . But I need this feature as soon as possible.*
See merge request !331
2015-02-11 01:34:33 +00:00
Marin Jankovski
00c7d533a0
Default issue tracker fix for creating default issue service.
2015-02-09 14:33:47 -08:00
Nikita Verkhovin
8681cb3137
Add labels notes
2015-02-08 22:35:41 +06:00
Dmitriy Zaporozhets
0a34f2dcb5
Merge pull request #8580 from j0k3r/asana
...
Add Asana service
2015-02-08 01:12:41 -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
4cce10583d
Fix tests for semaphore
2015-02-06 23:57:28 -08:00
Dmitriy Zaporozhets
89f8020fe1
Merge branch 'mention-groups'
...
Conflicts:
CHANGELOG
2015-02-06 16:45:37 -08:00
Dmitriy Zaporozhets
3e97ac2022
Add index on order columns
2015-02-06 10:21:48 -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
Dmitriy Zaporozhets
8952fc015f
Apply default scope to labels and remove one for notes
2015-02-05 20:29:41 -08:00
Dmitriy Zaporozhets
c5be267e40
Refactor issuable sorting a bit
2015-02-05 20:21:21 -08:00
Dmitriy Zaporozhets
bbca6a0abd
Refactor sorting in project
2015-02-05 19:15:05 -08:00
Dmitriy Zaporozhets
e0aa5c371e
Fix method overlap for issue sorting
2015-02-05 16:49:41 -08:00
Dmitriy Zaporozhets
62ed1c537e
Explicitly define ordering in models using default_scope
2015-02-05 14:20:55 -08:00
Douwe Maan
58ecb06f74
Remove duplicates from group milestone participants list.
2015-02-05 21:26:57 +01:00
Douwe Maan
9910b7ff99
Allow groups to be mentioned.
...
Resolves #1673 .
2015-02-05 19:10:52 +01:00
Dmitriy Zaporozhets
0e2fcb68d7
Disable project path blacklist
...
Because since project always belongs to namespace it dont need such
strict restrictions any more
2015-02-04 15:23:38 -08:00
Dmitriy Zaporozhets
Douwe Maan
Dmitriy Zaporozhets
Hannes RosenöggerandDouwe Maan
Marin Jankovski
Nikita Verkhovin
