Commit Graph

15 Commits

Author SHA1 Message Date
GitLab Bot 0ae8428c8e Add latest changes from gitlab-org/gitlab@master 2021-05-11 21:10:21 +00:00
GitLab Bot 2ac4833015 Add latest changes from gitlab-org/gitlab@master 2020-10-08 18:08:32 +00:00
GitLab Bot c596046be9 Add latest changes from gitlab-org/gitlab@master 2020-09-10 18:08:54 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
antonyliu 46e8c12436 Externalize strings of Two-Factor Authentication page in user profile 2019-05-31 12:32:11 +08:00
Pavel Shutsin 8ee1927db9 Move out link\unlink ability checks to a policy
We can extend the policy in EE for additional behavior
2019-03-19 15:38:16 +03:00
James Edwards-Jones 84352177d4 Replace @user with current_user on Account page
Previously we used @user, but this changed to local_assigns[:user]
so we could pass a second variable to the view from an EE module

Since we were already using current_user librally there it makes sense
to replace the remaining usages.

See: https://docs.gitlab.com/ee/development/module_with_instance_variables.html
2018-12-04 15:14:34 +00:00
James Edwards-Jones 5978b98c5f Backport GroupSAML unlink changes
- Improves spacing between account buttons on Profile
- AccountsController#show uses locals instead of instance variables
- New `display_providers_on_profile?` helper method
- Adds `render_if_exists` for GroupSAMl unlink buttons

See: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8682
2018-12-04 15:14:34 +00:00
gfyoung be42c05054 Enable more frozen string in app/controllers/
Enables frozen string for the following:

* app/controllers/dashboard/**/*.rb
* app/controllers/explore/**/*.rb
* app/controllers/google_api/**/*.rb
* app/controllers/groups/**/*.rb
* app/controllers/import/**/*.rb
* app/controllers/instance_statistics/**/*.rb
* app/controllers/ldap/**/*.rb
* app/controllers/oauth/**/*.rb
* app/controllers/profiles/**/*.rb

Partially addresses #47424.
2018-09-23 12:48:02 -07:00
Yorick Peterse 2039c8280d
Disable existing offenses for the CodeReuse cops
This whitelists all existing offenses for the various CodeReuse cops, of
which most are triggered by the CodeReuse/ActiveRecord cop.
2018-09-11 17:32:00 +02:00
Tiago Botelho b9adf92f3c Prevent users from disconnecting gitlab account from CAS 2017-03-31 18:42:34 +01:00
Patricio Cano 34bf165147 Disable the unlink feature for SAML connected accounts (social login). 2016-06-14 18:28:17 -05:00
Douwe Maan 26ad250989 Add a page title to every page. 2015-04-30 19:12:15 +02:00
Dmitriy Zaporozhets 777c119fd2 Restyle oauth accounts at profile page and add ability to unlink account 2015-03-21 17:46:00 -07:00
Dmitriy Zaporozhets 4c8224ae1e Move profile account to separate controller 2013-10-09 16:43:17 +03:00