diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-04-01 07:09:50 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-04-01 07:09:50 +0000 |
| commit | 045112b76bec372aa2d9d1f39fffb8ed08f2b388 (patch) | |
| tree | 1f65c29321f5f6f9f6875221b83bb30e8115b178 /lib | |
| parent | 82539cff700931532b22b6a8e3d6832137fc5d55 (diff) | |
| parent | 85cc1729596ac1e5b31d8cfa1daa07477db6033d (diff) | |
| download | gitlab-ce-045112b76bec372aa2d9d1f39fffb8ed08f2b388.tar.gz | |
Merge branch 'remove-twitter-congrats' into 'master'
Remove "Congratulations!" tweet button on newly-created project.
I’ve removed everything related to the feature based on this commit: ce08f919bfab73178b2f8c584f34fd8849834365
Resolves #10857.
See merge request !3451
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/current_settings.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index f686c568bee..b7de575cdcd 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -334,7 +334,6 @@ module API expose :updated_at expose :home_page_url expose :default_branch_protection - expose :twitter_sharing_enabled expose :restricted_visibility_levels expose :max_attachment_size expose :session_expire_delay diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 761b63e98f6..1acc22fe5bf 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -21,7 +21,6 @@ module Gitlab default_branch_protection: Settings.gitlab['default_branch_protection'], signup_enabled: Settings.gitlab['signup_enabled'], signin_enabled: Settings.gitlab['signin_enabled'], - twitter_sharing_enabled: Settings.gitlab['twitter_sharing_enabled'], gravatar_enabled: Settings.gravatar['enabled'], sign_in_text: Settings.extra['sign_in_text'], restricted_visibility_levels: Settings.gitlab['restricted_visibility_levels'], |