diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-09-09 14:27:47 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-09-09 14:27:47 -0500 |
| commit | b9f7bc149b2a6abfbdaee83e6992b617b8bdb18e (patch) | |
| tree | 355225f4424a6ea1b40c66c5540ccab42096e3bf /app/views/about | |
| parent | e18ed4bbc7ab4e258d05a3e2a5db0790f67a8f37 (diff) | |
| parent | 5d170587e3b6c1a3b3ebe0910b62a4c526e2900d (diff) | |
Merge branch 'origin/master' into sync/upstream
Conflicts: app/javascript/mastodon/components/status_list.js app/javascript/mastodon/features/notifications/index.js app/javascript/mastodon/features/ui/components/modal_root.js app/javascript/mastodon/features/ui/components/onboarding_modal.js app/javascript/mastodon/features/ui/index.js app/javascript/styles/about.scss app/javascript/styles/accounts.scss app/javascript/styles/components.scss app/presenters/instance_presenter.rb app/services/post_status_service.rb app/services/reblog_service.rb app/views/about/more.html.haml app/views/about/show.html.haml app/views/accounts/_header.html.haml config/webpack/loaders/babel.js spec/controllers/api/v1/accounts/credentials_controller_spec.rb
Diffstat (limited to 'app/views/about')
| -rw-r--r-- | app/views/about/more.html.haml | 4 | ||||
| -rw-r--r-- | app/views/about/show.html.haml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml index 6d621ce8b..99d7d2972 100644 --- a/app/views/about/more.html.haml +++ b/app/views/about/more.html.haml @@ -63,9 +63,9 @@ .footer-links .container %p - = link_to t('about.source_code'), 'https://github.com/glitch-soc/mastodon' + = link_to t('about.source_code'), @instance_presenter.source_url - if @instance_presenter.commit_hash == "" - %strong= @instance_presenter.version_number + %strong= " (#{@instance_presenter.version_number})" - else %strong= "#{@instance_presenter.version_number}, " %strong= "#{@instance_presenter.commit_hash}" diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml index 3e04dd038..5962436fc 100644 --- a/app/views/about/show.html.haml +++ b/app/views/about/show.html.haml @@ -58,7 +58,7 @@ = @instance_presenter.closed_registrations_message.html_safe = link_to t('about.find_another_instance'), 'https://joinmastodon.org/', class: 'button button-alternative button--block' - .learn-more-cta + .about-short .container %h3= t('about.description_headline', domain: site_hostname) %p= @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname) @@ -76,7 +76,7 @@ .footer-links .container %p - = link_to t('about.source_code'), 'https://github.com/glitch-soc/mastodon' + = link_to t('about.source_code'), @instance_presenter.source_url - if @instance_presenter.commit_hash == "" %strong= " (#{@instance_presenter.version_number})" - else |