home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,122 Commits 48 Branches 340 Tags
6a0ea920a5735b25f2dbadd00a5238a73600a5a1
Commit Graph
226 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets ffc284301e Merge branch 'ldap/cache_check' into 'master' 
Cache LDAP check everywhere

See merge request !1008
 2014-08-13 13:11:04 +00:00
Jacob Vosmaer e0fea696c6 Skip LDAP cache check when LDAP is disabled 2014-08-06 18:03:01 +02:00
Dmitriy Zaporozhets e21ca9f8b1 Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosantilli-star 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-07-24 10:54:42 +03:00
Dmitriy Zaporozhets c29857ac00 Merge branch 'new_user_password_set' into 'master' 
Admin created user should get password reset link instead of mailed temporary password

Fixes #1405

See merge request !973
 2014-07-23 16:44:07 +00:00
Dmitriy Zaporozhets 72f50fcb2c Merge branch 'fix/avatar_relative_url' into 'master' 
Fix Avatar and Relative URL

Fixes https://github.com/gitlabhq/gitlabhq/issues/7270

Instead of `URI::join` use a simple join with a slash. This is how all other places in GitLab join URLs and it doesn't muck with the relative path.

See merge request !144
 2014-07-21 10:34:41 +00:00
Ciro Santilli 9b5c7a4d60 Add star count, view logic, more tests. 2014-07-17 22:47:16 +02:00
Ciro Santilli 714f7201d3 Add project stars. 2014-07-17 22:47:16 +02:00
Marin Jankovski 188b6f48d4 Use a better name for token. 2014-07-16 10:01:13 +02:00
Marin Jankovski 56398ea161 Do not sent a generated password via email for admin created user. 2014-07-15 13:25:11 +02:00
Marin Jankovski 4024aa8e81 Try to keep token authenticable compatibility 2014-07-09 14:42:25 +02:00
Drew Blessing fe1553e943 Don't use URI join 2014-07-07 16:25:05 -05:00
Dmitriy Zaporozhets d35a99e6cb Merge pull request #7204 from cirosantilli/user-validation-msg 
Fix username validation message to match regexp.
 2014-07-02 09:57:14 +03:00
Dmitriy Zaporozhets 8fee5a0572 Make app works with strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 23:24:17 +03:00
Dmitriy Zaporozhets 98ba075c32 User model to strong params. Comment other attr_accessible to let tests run 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 15:11:45 +03:00
Ciro Santilli b1c40e8151 Fix username validation message to match regexp. 
Also used for project, group and web ui new file names.
 2014-06-26 13:31:34 +02:00
Dmitriy Zaporozhets 1817b9aec4 Fix namespace selector on Projects#new page 
If user does not own any group he does not see namespace selector when
visit new project page even if he has master membership in one of
groups. This commit fixes it.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 15:12:08 +03:00
Dmitriy Zaporozhets 6d352790c4 Fix user notifications 2014-06-17 22:54:21 +03:00
Dmitriy Zaporozhets a90a201d0e Remove user observer 2014-06-17 22:32:35 +03:00
Dmitriy Zaporozhets a7345e368a Fix gravatar size and update docs for new users API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 18:02:42 +03:00
Dmitriy Zaporozhets ae564c97d4 Dont expose user email via API 
To prevent leaking of users info we reduce amount of user information
retrieved via API for normal users.

What user can get via API:

* if not admin: only id, state, name, username and avatar_url
* if admin: all user information
* about himself: all informaion

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 17:46:48 +03:00
Dmitriy Zaporozhets e9de569458 Fix tests for user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 13:43:07 +03:00
Dmitriy Zaporozhets aea79b8035 Add ability rule for creating project in namespace 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:03:01 +03:00
Dmitriy Zaporozhets 36f861f1b1 Re-annotate models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 15:05:03 +03:00
Dmitriy Zaporozhets c5cdd07899 Add values to default fields to prevent 500 error when migrate from MySQL to Postgres 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 13:36:25 +03:00
Dmitriy Zaporozhets e6f58cb87d Avoid false validation when create user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 16:47:37 +03:00
Dmitriy Zaporozhets a73df4f72d Allow oauth signup without email 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 14:09:29 +03:00
Marin Jankovski 1aabfcb92d Change the user search query to be case insensitive. 2014-03-26 12:45:39 +01:00
Sytse Sijbrandij 6b522bf950 Merge pull request #6457 from lol768/patch-1 
Fix registration error info typo
 2014-03-19 16:06:31 +01:00
Dmitriy Zaporozhets c6d39a14d6 Add User#requires_ldap_check? method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-11 10:24:07 +02:00
lol768 39bb54feb3 Fix registration error info typo 2014-03-02 18:45:38 +00:00
Marin Jankovski c1dddf8c7d Uniqueness check should be case insensitive for username and path, otherwise mysql behaves weird. 2014-02-20 09:45:58 +01:00
Jason Hollingsworth 29cfd33d94 Add email aliases for users 
Emails are used to associate commits with users. The emails
are not verified and don't have to be valid email addresses. They
are assigned on a first come, first serve basis.

Notifications are sent when an email is added.
 2014-02-13 22:59:39 -06:00
GitLab 46ad09bf70 code refactor as per standards 2014-02-11 19:04:47 +05:30
GitLab 319f355aed merge with upstream master 2014-02-06 16:56:20 +05:30
Dmitriy Zaporozhets 4d56c359d3 Merge pull request #6075 from skv-headless/remove_deprecated_finders 
Remove deprecated finders
 2014-01-22 11:04:56 -08:00
skv a3f645ef51 Remove deprecated finders 2014-01-19 23:39:56 +04:00
Dmitriy Zaporozhets 3628eb84c4 Merge pull request #6072 from jvanbaarsen/fix-3516 
Better check on the validity of emails
 2014-01-19 10:29:06 -08:00
Jerome Dalbert 2e3f250d45 Add website url to user 2014-01-18 19:15:10 +00:00
Jeroen van Baarsen 05e4af5b4c Better check on the validity of emails 
At this moment it was possible to enter emails like:
mailto:info@example.com. This was causing some issue in the frontend,
since those links became html mailto: links.

Fixes: #3516
 2014-01-16 12:14:47 +01:00
Dmitriy Zaporozhets 4cd7a56333 Add User#email uniq validation. Fixed confirmation for admin/users form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-26 10:20:36 +02:00
Dmitriy Zaporozhets a389d77769 Fix User#by_username_or_id for postgres 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-26 10:09:15 +02:00
Dmitriy Zaporozhets e6f83399f3 Dont allow upload of non-image formats for user avatar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 20:28:59 +02:00
Dmitriy Zaporozhets b7fc0e81ce Merge pull request #5849 from bke-drewb/feature/hide_no_ssh_key_message 
Allow user to hide the message to add an ssh key permanently
 2013-12-16 03:25:00 -08:00
Drew Blessing d9b5777db1 Allow user to hide the message to add an ssh key permanently 
Favor links instead of buttons

Remove unnecessary class

Remove extra space
 2013-12-14 20:21:12 -06:00
skv d89527839e fix most of warnings 2013-12-15 00:05:10 +04:00
Drew Blessing c26d392b1a Expire event cache on avatar creation/removal 2013-12-11 09:30:22 -06:00
Dmitriy Zaporozhets 0124ae18c5 Fix User#by_username_or_id for postgres 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 13:20:35 +02:00
Dmitriy Zaporozhets 77febe8f1e Fixed mistake and mock warning 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 12:11:28 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets 70bb976bc6 Fixed the last deprecation warnings for order and where 2013-12-10 12:11:28 +02:00
Dmitriy Zaporozhets 475fedc0a7 Make User#accessible_deploy_keys works in rails4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 12:11:27 +02:00