diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js index f7be1f75a4..7088433927 100644 --- a/app/assets/javascripts/discourse/models/user.js +++ b/app/assets/javascripts/discourse/models/user.js @@ -437,15 +437,7 @@ Discourse.User = Discourse.Model.extend({ }); } }, function () {}); - }, - - githubProfileUrl: function(){ - - var screenName = this.get('github_screen_name'); - if(screenName) { - return "https://github.com/" + screenName; - } - }.property() + } }); diff --git a/app/assets/javascripts/discourse/templates/user-card.hbs b/app/assets/javascripts/discourse/templates/user-card.hbs index ebf1de9c21..b20a196bad 100644 --- a/app/assets/javascripts/discourse/templates/user-card.hbs +++ b/app/assets/javascripts/discourse/templates/user-card.hbs @@ -57,9 +57,6 @@

{{i18n last_post}} {{format-date path="user.last_posted_at" leaveAgo="true"}}

{{i18n joined}} {{format-date path="user.created_at" leaveAgo="true"}}

- {{#if user.githubProfileUrl}} -

{{i18n user.github_profile}}

- {{/if}}
{{/if}} diff --git a/app/assets/javascripts/discourse/templates/user/user.hbs b/app/assets/javascripts/discourse/templates/user/user.hbs index 75f4fd5b73..062fa51f9f 100644 --- a/app/assets/javascripts/discourse/templates/user/user.hbs +++ b/app/assets/javascripts/discourse/templates/user/user.hbs @@ -150,10 +150,6 @@ {{/if}} {{/if}} - {{#if github_screen_name}} -
GitHub
-
{{github_screen_name}}
- {{/if}} {{plugin-outlet "user-profile-secondary"}} diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss index da9d689aee..c06d52a22a 100644 --- a/app/assets/stylesheets/desktop/user.scss +++ b/app/assets/stylesheets/desktop/user.scss @@ -215,9 +215,6 @@ overflow: hidden; text-overflow: ellipsis; color: $primary; - a { - color: $primary; - } } dt { diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss index 33071abf67..7acd33b644 100644 --- a/app/assets/stylesheets/mobile/user.scss +++ b/app/assets/stylesheets/mobile/user.scss @@ -257,9 +257,6 @@ overflow: hidden; text-overflow: ellipsis; color: $primary; - a { - color: $primary; - } } dt { diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb index 1b17b06eb8..00d5f27dce 100644 --- a/app/serializers/user_serializer.rb +++ b/app/serializers/user_serializer.rb @@ -48,8 +48,7 @@ class UserSerializer < BasicUserSerializer :has_title_badges, :edit_history_public, :custom_fields, - :user_fields, - :github_screen_name + :user_fields has_one :invited_by, embed: :object, serializer: BasicUserSerializer has_many :custom_groups, embed: :object, serializer: BasicGroupSerializer @@ -89,11 +88,6 @@ class UserSerializer < BasicUserSerializer ### ### ATTRIBUTES ### - def github_screen_name - if SiteSetting.public_github_screen_name - object.github_user_info && object.github_user_info.screen_name - end - end def include_email? object.id && object.id == scope.user.try(:id) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 0dac266c15..67a2df56b8 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -808,7 +808,6 @@ en: facebook_app_secret: "App secret for Facebook authentication, registered at https://developers.facebook.com/apps" enable_github_logins: "Enable Github authentication, requires github_client_id and github_client_secret" - public_github_screen_name: "Display Github screen names publicly in the forum (on user page and profile)" github_client_id: "Client id for Github authentication, registered at https://github.com/settings/applications" github_client_secret: "Client secret for Github authentication, registered at https://github.com/settings/applications" diff --git a/config/site_settings.yml b/config/site_settings.yml index b97fae5f7f..2274aa2350 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -212,7 +212,6 @@ login: enable_github_logins: client: true default: false - public_github_screen_name: true github_client_id: default: '' regex: "^[a-f0-9]*$"