Commit Graph

39 Commits

Author SHA1 Message Date
Alfredo Sumaran a42b2c388d Merge branch 'master' into issue_7959 2016-03-22 11:13:27 -05:00
Robert Speicher 085538c2bd Use the configured Kaminari "per page" default 2016-03-19 17:37:54 -04:00
Alfredo Sumaran 768008f605 Respond to json requests 2016-03-17 09:41:38 -05:00
Rémy Coutable 5c1f6f8cfc Merge branch 'revert-avatar-cropping' into 'master'
Revert the avatar cropping feature

Reverts !2951 since the added 'mini_magick' dependency should be replaced by client-side croppping

See merge request !3223
2016-03-15 15:53:42 +00:00
Rémy Coutable 1714883107 Revert "Merge branch 'avatar-cropping' into 'master' "
This reverts commit 01160fc061, reversing
changes made to 4bff9daf8b.
2016-03-15 14:55:40 +01:00
Robert Speicher 8f21e2ae40 Let `oauth/applications#index` handle the `profiles#applications` route
Previously we were doing all of kinds of code gymnastics and flash abuse
in order to work with a Doorkeeper controller but have it _appear_ at
the `/profile/applications` path. Fortunately we can just tell Rails to
use a different controller to handle that route, and we get the best of
both worlds.
2016-03-13 16:51:09 -04:00
Phil Hughes 33ba32e6cc Applications tab on profile settings
Closes #13855
2016-03-04 09:06:07 +00:00
Johann Pardanaud 6d5808801f Fix #7959: Fix avatar stretching by providing a cropping feature 2016-02-09 22:26:50 +01:00
Andrew Tomaka 1c53dc28b5 Notify user if they cannot create projects 2015-12-05 11:32:08 -05:00
Stan Hu 9bfc531ec6 Redirect to a default path if HTTP_REFERER is not set
Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode,
and it's possible load balancers/proxies strip the HTTP_REFERER from
the request header. In these cases, default to some default path.

Closes #3122

Closes https://github.com/gitlabhq/gitlabhq/issues/9731
2015-10-20 07:45:48 -07:00
Dmitriy Zaporozhets f3590c83ea Merge branch 'audit_log' into 'master'
Audit log for user authentication

https://dev.gitlab.org/gitlab/gitlabhq/issues/2318

See merge request !931
2015-07-06 10:09:53 +00:00
Valery Sizov 411829fdb5 Audit log for user authentication 2015-07-06 12:36:08 +03:00
Douwe Maan cd5e79e98b Correctly show anonymous authorized applications under Profile > Applications. 2015-07-02 11:53:31 +02:00
Robert Speicher 1044dfbfd2 Remove js handler from Profiles#update
It was only used for the appearance live updating, which is now handled
by Profiles::Preferences#update
2015-06-13 17:58:16 -04:00
Robert Speicher 0c0c31ff34 Move the "Design" templates and logic to Preferences 2015-06-13 17:58:16 -04:00
Douwe Maan 26ad250989 Add a page title to every page. 2015-04-30 19:12:15 +02:00
Jeroen van Baarsen 5a4ebfb47a Fixed the Rails/ActionFilter cop
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-04-20 15:39:37 +02:00
Senorsen 7b28218f96 Allow user to choose which email to be public
This commit allows user to show one of their emails in profile page,
or don't show email in this page.
2015-04-14 19:42:48 +08:00
Dmitriy Zaporozhets f0d052b6e7 Merge branch 'user-location' into 'master'
Location field in user profile

Twitter allows you to set string with location information.
I find it very useful in work to know where user from. It allows to communicate with knowing time difference and cultural things.

See merge request !411
2015-03-21 00:54:03 +00:00
Dmitriy Zaporozhets 6ef20926ee Add location to user profile 2015-03-20 16:52:23 -07:00
Carlos Ribeiro 2435476167 Add error message when have error on profile screen 2015-03-19 23:31:25 -03:00
Dmitriy Zaporozhets f0cbbd70bb Use same constant for amount of items per page 2015-03-12 15:37:00 -07:00
Vinnie Okada e0f61a59b4 Use shorter map() syntax 2015-02-15 20:50:53 -07: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
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
Dmitriy Zaporozhets 592e396869
Rework oauth2 feature
* improve UI
* add authorization
* add separate page for oauth applications

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-25 18:35:04 +02: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
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
Dmitriy Zaporozhets b2e4664cc7
Read-only email field for LDAP user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-27 10:32:37 +02:00
Dmitriy Zaporozhets ffec158de4 Restyle Profile#Account page 2013-10-09 16:43:24 +03:00
Dmitriy Zaporozhets 09cb2ba815 Fix password update 2013-09-24 22:12:48 +03:00
Dmitriy Zaporozhets 642398285d Force user to provide old password in order to change it 2013-09-24 10:48:36 +03:00
Dmitriy Zaporozhets 8dd6af1466 Sanitize user attrs on model level 2013-07-10 13:48:50 +03:00
Dmitriy Zaporozhets 7cb86eb335 Dont allow LDAP users to change password inside GitLab 2013-05-24 17:12:27 +03:00
Dmitriy Zaporozhets 921151d041 strip tags from user profile 2013-04-03 16:31:28 +03:00
Dmitriy Zaporozhets 5e69ad2cea Sanitize user profile input 2013-02-25 22:51:15 +02:00
Jaakko Kantojärvi ba65f2910b Add option to disable username changing
This option allows to disable users from changing their username.

This is very usefull in environments using strong internal authentication methods like ldap, pam or shibboleth.

You can allow users to change theyr username in these environments, but then new users (users loging in first time) is blocked from gitlab is her username exists.
2013-02-14 17:58:56 +02:00
Dmitriy Zaporozhets 46bf3a0949 Refactored profile to resource. Added missing flash notice on successfull updated. Update username via ajax 2012-12-02 13:29:24 +02:00