about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorAsh Furrow <ash@ashfurrow.com>2017-04-20 21:30:59 -0400
committerEugen <eugen@zeonfederated.com>2017-04-21 03:30:59 +0200
commita0ed88a99b736cc786b048126580a7e73c68b07e (patch)
treea1d53aa9f65a0cfe4717ca3f31819bb3c74bd490 /config
parent25d2853db2cb6603c398b6622526e579e974d593 (diff)
Adds version to about/more and API (#2181)
* Adds version.

* Cleans up code.

* Removes standalone endpoint and adds version to instance endpoint.

* Addresses feedback from #2181.
Diffstat (limited to 'config')
-rw-r--r--config/application.rb1
-rw-r--r--config/locales/en.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index 59aa7b5f5..e67e3e051 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -9,6 +9,7 @@ Bundler.require(*Rails.groups)
 require_relative '../app/lib/exceptions'
 require_relative '../lib/paperclip/gif_transcoder'
 require_relative '../lib/paperclip/video_transcoder'
+require_relative '../lib/mastodon/version'
 
 Dotenv::Railtie.load
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c7b6a17d6..c1438134f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -29,6 +29,7 @@ en:
     terms: Terms
     user_count_after: users
     user_count_before: Home to
+    version: Version
   accounts:
     follow: Follow
     followers: Followers