Merge branch 'release/0.7.14.0'

.rubocop.yml

@@ -12,7 +12,7 @@ Rails/HttpPositionalArguments:
   Enabled: false
 
 # Commonly used screens these days easily fit more than 80 characters.
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 
 # Too short methods lead to extraction of single-use methods, which can make
@@ -62,7 +62,7 @@ Style/SymbolArray:
   Enabled: true
 
 # Most readable form.
-Layout/AlignHash:
+Layout/HashAlignment:
   EnforcedHashRocketStyle: table
   EnforcedColonStyle: table
 
@@ -84,7 +84,6 @@ Style/CollectionMethods:
     # inject seems more common in the community.
     reduce: "inject"
 
-
 # Either allow this style or don't. Marking it as safe with parenthesis
 # is silly. Let's try to live without them for now.
 Style/ParenthesesAroundCondition:
@@ -111,7 +110,7 @@ Style/SignalException:
 # Suppressing exceptions can be perfectly fine, and be it to avoid to
 # explicitly type nil into the rescue since that's what you want to return,
 # or suppressing LoadError for optional dependencies
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Enabled: false
 
 Layout/SpaceInsideBlockBraces:
@@ -174,3 +173,13 @@ Style/NumericPredicate:
 # Reset some HoundCI changes back to Rubocop defaults
 Layout/DotPosition:
   EnforcedStyle: leading
+
+# Not enabled by default but good
+Style/HashEachMethods:
+  Enabled: true
+
+# TODO: Enable with Ruby 2.5
+Style/HashTransformKeys:
+  Enabled: false
+Style/HashTransformValues:
+  Enabled: false

.ruby-version

-2.4
+2.6

.travis.yml

 language: ruby
 
 rvm:
-  - 2.4.2
-  - 2.3.5
+  - 2.6.6
+  - 2.5.8
 
 env:
   - DB=postgresql BUILD_TYPE=cucumber

Changelog.md

+# 0.7.14.0
+
+## Refactor
+* Update the suggested Ruby version to 2.6. If you run into trouble during the update and you followed our installation guides, run `rvm install 2.6`. [#7929](https://github.com/diaspora/diaspora/pull/7929)
+
+## Bug fixes
+* Don't link to deleted users in admin user stats [#8063](https://github.com/diaspora/diaspora/pull/8063)
+* Properly validate a profile's gender field length instead of failing with a database error. [#8127](https://github.com/diaspora/diaspora/pull/8127)
+
+## Features
+
 # 0.7.13.0
 
 ## Security

Gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "5.2.4.1"
+gem "rails", "5.2.4.3"
 
 # Legacy Rails features, remove me!
 # responders (class level)
@@ -10,7 +10,7 @@ gem "responders", "2.4.1"
 
 # Appserver
 
-gem "unicorn", "5.5.1", require: false
+gem "unicorn", "5.5.3", require: false
 gem "unicorn-worker-killer", "0.4.4"
 
 # Federation
@@ -21,7 +21,7 @@ gem "diaspora_federation-rails", "0.2.6"
 # API and JSON
 
 gem "acts_as_api", "1.0.1"
-gem "json",        "2.2.0"
+gem "json",        "2.3.0"
 gem "json-schema", "2.8.1"
 
 # Authentication
@@ -29,16 +29,16 @@ gem "json-schema", "2.8.1"
 gem "devise", "4.7.1"
 gem "devise-two-factor", "3.0.3"
 gem "devise_lastseenable", "0.0.6"
-gem "rqrcode", "0.10.1"
+gem "rqrcode", "1.1.2"
 
 # Captcha
 
-gem "simple_captcha2", "0.4.3", require: "simple_captcha"
+gem "simple_captcha2", "0.5.0", require: "simple_captcha"
 
 # Background processing
 
 gem "redis", "3.3.5" # Pinned to 3.3.x because of https://github.com/antirez/redis/issues/4272
-gem "sidekiq", "5.2.7"
+gem "sidekiq", "5.2.8"
 
 # Scheduled processing
 
@@ -46,7 +46,7 @@ gem "sidekiq-cron", "1.1.0"
 
 # Compression
 
-gem "uglifier", "4.1.20"
+gem "uglifier", "4.2.0"
 
 # Configuration
 
@@ -68,19 +68,19 @@ gem "sprockets-rails",        "3.2.1"
 # Database
 
 group :mysql, optional: true do
-  gem "mysql2", "0.5.2"
+  gem "mysql2", "0.5.3"
 end
 group :postgresql, optional: true do
-  gem "pg",     "1.1.4"
+  gem "pg",     "1.2.3"
 end
 
 
-gem "activerecord-import", "1.0.2"
+gem "activerecord-import", "1.0.4"
 
 # File uploading
 
 gem "carrierwave", "1.3.1"
-gem "fog-aws",     "3.5.1"
+gem "fog-aws",     "3.5.2"
 gem "mini_magick", "4.10.1"
 
 # GUID generation
@@ -92,9 +92,9 @@ gem "entypo-rails", "3.0.0"
 
 # JavaScript
 
-gem "handlebars_assets", "0.23.4"
+gem "handlebars_assets", "0.23.8"
 gem "jquery-rails",      "4.3.5"
-gem "js-routes",         "1.4.7"
+gem "js-routes",         "1.4.9"
 gem "js_image_paths",    "0.1.1"
 
 source "https://gems.diasporafoundation.org" do
@@ -138,19 +138,19 @@ gem "rails-i18n",           "5.1.3"
 gem "markerb",             "1.1.0"
 
 # Map
-gem "leaflet-rails",       "1.5.1"
+gem "leaflet-rails",       "1.6.0"
 
 # Parsing
 
-gem "nokogiri",          "1.10.8"
+gem "nokogiri",          "1.10.9"
 gem "open_graph_reader", "0.7.0" # also update User-Agent in features/support/webmock.rb
-gem "redcarpet",         "3.4.0"
+gem "redcarpet",         "3.5.0"
 gem "ruby-oembed",       "0.12.0"
 gem "twitter-text",      "1.14.7"
 
 # RTL support
 
-gem "string-direction", "1.2.1"
+gem "string-direction", "1.2.2"
 
 # Security Headers
 
@@ -158,11 +158,11 @@ gem "secure_headers", "6.3.0"
 
 # Services
 
-gem "omniauth",           "1.9.0"
+gem "omniauth",           "1.9.1"
 gem "omniauth-tumblr",    "1.2"
 gem "omniauth-twitter",   "1.4.0"
 gem "omniauth-wordpress", "0.2.2"
-gem "twitter",            "6.2.0"
+gem "twitter",            "7.0.0"
 
 # OpenID Connect
 gem "openid_connect", "1.1.8"
@@ -177,11 +177,11 @@ gem "rails-assets-diaspora_jsxc", "0.1.5.develop.7", source: "https://gems.diasp
 
 # Tags
 
-gem "acts-as-taggable-on", "6.0.0"
+gem "acts-as-taggable-on", "6.5.0"
 
 # URIs and HTTP
 
-gem "addressable",        "2.6.0", require: "addressable/uri"
+gem "addressable",        "2.7.0", require: "addressable/uri"
 gem "faraday",            "0.15.4"
 gem "faraday_middleware", "0.13.1"
 gem "faraday-cookie_jar", "0.0.6"
@@ -189,11 +189,11 @@ gem "typhoeus",           "1.3.1"
 
 # Views
 
-gem "gon",                     "6.2.1"
-gem "hamlit",                  "2.9.3"
+gem "gon",                     "6.3.2"
+gem "hamlit",                  "2.11.0"
 gem "mobile-fu",               "1.4.0"
-gem "rails-timeago",           "2.17.1"
-gem "will_paginate",           "3.1.7"
+gem "rails-timeago",           "2.18.0"
+gem "will_paginate",           "3.3.0"
 
 # Logging
 
@@ -210,7 +210,7 @@ gem "rubyzip", "1.3.0", require: "zip"
 # https://github.com/discourse/discourse/pull/238
 gem "minitest"
 
-gem "versionist", "2.0.0"
+gem "versionist", "2.0.1"
 
 # Windows and OSX have an execjs compatible runtime built-in, Linux users should
 # install Node.js or use "therubyracer".
@@ -236,30 +236,30 @@ group :production do # we don"t install these on travis to speed up test runs
 
   # Third party asset hosting
 
-  gem "asset_sync", "2.7.0", require: false
+  gem "asset_sync", "2.11.0", require: false
 end
 
 group :development do
   # Automatic test runs
-  gem "guard",          "2.15.0", require: false
+  gem "guard",          "2.16.1", require: false
   gem "guard-rspec",    "4.7.3", require: false
   gem "guard-rubocop",  "1.3.0", require: false
   gem "rb-fsevent",     "0.10.3", require: false
-  gem "rb-inotify",     "0.10.0", require: false
+  gem "rb-inotify",     "0.10.1", require: false
 
   # Linters
-  gem "haml_lint",      "0.28.0", require: false
+  gem "haml_lint",      "0.35.0", require: false
   gem "pronto",         "0.10.0", require: false
   gem "pronto-eslint",  "0.10.0", require: false
   gem "pronto-haml",    "0.10.0", require: false
   gem "pronto-rubocop", "0.10.0", require: false
   gem "pronto-scss",    "0.10.0", require: false
-  gem "rubocop",        "0.72.0", require: false
-  gem "rubocop-rails",  "2.1.0", require: false
+  gem "rubocop",        "0.80.1", require: false
+  gem "rubocop-rails",  "2.4.1", require: false
 
   # Preloading environment
 
-  gem "spring", "2.0.2"
+  gem "spring", "2.1.0"
   gem "spring-commands-rspec", "1.0.4"
   gem "spring-commands-cucumber", "1.0.1"
 
@@ -276,25 +276,25 @@ end
 group :test do
   # RSpec (unit tests, some integration tests)
 
-  gem "fixture_builder",   "0.5.2.rc3"
-  gem "fuubar",            "2.4.1"
+  gem "fixture_builder",   "0.5.2"
+  gem "fuubar",            "2.5.0"
   gem "json-schema-rspec", "0.0.4"
   gem "rspec-json_expectations", "~> 2.1"
 
   # Cucumber (integration tests)
 
   gem "capybara",           "3.15.0"
-  gem "database_cleaner",   "1.7.0"
+  gem "database_cleaner",   "1.8.3"
   gem "poltergeist",        "1.18.1"
 
   gem "cucumber-api-steps", "0.14", require: false
 
   # General helpers
 
-  gem "factory_girl_rails", "4.8.0"
+  gem "factory_girl_rails", "4.9.0"
   gem "shoulda-matchers",   "4.0.1"
   gem "timecop",            "0.9.1"
-  gem "webmock",            "3.6.0", require: false
+  gem "webmock",            "3.8.3", require: false
 
   gem "diaspora_federation-test", "0.2.6"
 
@@ -304,13 +304,13 @@ end
 
 group :development, :test do
   # RSpec (unit tests, some integration tests)
-  gem "rspec-rails", "3.8.2"
+  gem "rspec-rails", "3.9.1"
 
   # Cucumber (integration tests)
-  gem "cucumber-rails", "1.7.0", require: false
+  gem "cucumber-rails", "2.0.0", require: false
 
   # Jasmine (client side application tests (JS))
-  gem "jasmine",                   "3.4.0"
+  gem "jasmine",                   "3.5.1"
   gem "jasmine-jquery-rails",      "2.0.3"
   gem "rails-assets-jasmine-ajax", "4.0.0", source: "https://gems.diasporafoundation.org"
   gem "sinon-rails",               "1.15.0"

app/controllers/admins_controller.rb

@@ -43,7 +43,7 @@ class AdminsController < Admin::AdminController
     @created_users = User.where("username IS NOT NULL and created_at IS NOT NULL")
     @created_users.find_each do |u|
       week = u.created_at.beginning_of_week.strftime("%Y-%m-%d")
-      @created_users_by_week[week] << u.username
+      @created_users_by_week[week] << {username: u.username, closed_account: u.person.closed_account}
     end
 
     @selected_week = params[:week] || @created_users_by_week.keys.last

app/models/profile.rb

@@ -21,6 +21,7 @@ class Profile < ApplicationRecord
   validates :first_name, :length => { :maximum => 32 }
   validates :last_name, :length => { :maximum => 32 }
   validates :location, :length => { :maximum =>255 }
+  validates :gender, length: {maximum: 255}
 
   validates_format_of :first_name, :with => /\A[^;]+\z/, :allow_blank => true
   validates_format_of :last_name, :with => /\A[^;]+\z/, :allow_blank => true

app/views/admins/_weekly_user_stats.haml

@@ -18,4 +18,8 @@
 = t(".amount_of", count: counter)
 %br
 - created_users_by_week[selected_week].each do |m|
-  = link_to m, "/u/#{m}"
+  - if m[:closed_account]
+    %s
+      = m[:username]
+  - else
+    = link_to m[:username], "/u/#{m[:username]}"

config/defaults.yml

@@ -4,7 +4,7 @@
 
 defaults:
   version:
-    number: "0.7.13.0" # Do not touch unless doing a release, do not backport the version number that's in master
+    number: "0.7.14.0" # Do not touch unless doing a release, do not backport the version number that's in master
   heroku: false
   environment:
     url: "http://localhost:3000/"

config/locales/diaspora/el.yml

@@ -258,7 +258,11 @@ el:
     pods:
       use_search_box_q: "Πώς μπορώ να χρησιμοποιήσω το πλαίσιο αναζήτησης για να βρω συγκεκριμένα άτομα;"
     posts_and_posting:
+      format_text_q: "Πώς μπορώ να επεξεργαστώ το κείμενό στις δημοσιεύσεις μου (bold,italics, κτλ.);"
+      hide_posts_q: "Πώς μπορώ να κρύψω μία δημοσίευση;"
+      insert_images_comments_q: "Μπορώ να εισάγω εικόνες στα σχόλια;"
       insert_images_q: "Πώς μπορώ να εισάγω εικόνες στις αναρτήσεις;"
+      size_of_images_q: "Μπορώ να επεξεργαστώ το μέγεθος των εικόνων στις δημοσιεύσεις ή στα σχόλια;"
     private_posts:
       title: "Ιδιωτικές αναρτήσεις"
     third_party_tools: "Εργαλεία τρίτων"

config/locales/diaspora/ia.yml

@@ -488,7 +488,7 @@ ia:
       format_text_q: "Como pote io formatar le texto in mi entratas (grasse, italic, etc.)?"
       hide_posts_a: "Si tu puncta le mouse verso le parte superior de un entrata, un × appare al dextra. Clicca sur illo pro celar le entrata e silentiar le notificationes sur illo. Tu pote ancora vider le entrata si tu visita le pagina de profilo del persona qui lo ha inviate."
       hide_posts_q: "Como cela io un entrata?"
-      ignore_user_a1: "Si tu actualmente divide cosas con ille persona, remover la de tote tu aspectos eliminara le majoritate de su entratas de tu fluxo. Un methodo plus complete es \"ignorar\" le conto in question. Isto impedira que alcun entrata sue appare in tu fluxo, e illa non plus potera commentar o appreciar tu entratas. Nonobstante, illa ancora pote repeter tu entratas e commentar le repetitiones de tu entratas, e su commentos sur entratas de altere personas que appare in tu fluxo continuara a esser visibile pro te."
+      ignore_user_a1: "Si tu actualmente divide cosas con ille persona, remover la de tote tu aspectos elimina le majoritate de su entratas de tu fluxo. Un methodo plus complete es \"ignorar\" le conto in question. Isto impedi que alcun entrata sue appare in tu fluxo, e illa non plus pote commentar o appreciar tu entratas. Nonobstante, illa ancora pote repeter tu entratas e commentar le repetitiones de tu entratas, e su commentos sur entratas de altere personas que appare in tu fluxo continua a esser visibile pro te."
       ignore_user_a2: "Pro ignorar un conto, clicca sur le icone “ignorar” (un circulo con un linea diagonal que lo transversa) in cyma al dextra de un de su entratas. Su entratas disparera immediatemente de tu fluxo. Alternativemente, visita su pagina de profilo e clicca sur le icone “ignorar” illac. Tu potera ancora vider su entratas sur su pagina de profilo, o per usar le vista de entrata singule."
       ignore_user_a3: "Le lista de personas que tu ignora se trova in le configuration de tu conto sub Confidentialitate. Pro cessar de ignorar un persona, remove la del lista sur ille pagina."
       ignore_user_q: "Como impedi io que le entratas de un persona appare in mi fluxo?"
@@ -679,9 +679,9 @@ ia:
       other: "%{actors} commentava tu entrata %{post_link}."
       zero: "%{actors} commentava tu entrata %{post_link}."
     contacts_birthday:
-      one: "%{actors} ha su anniversario le %{date}."
-      other: "%{actors} ha lor anniversario le %{date}."
-      zero: "%{actors} ha lor anniversario le %{date}."
+      one: "%{actors} ha su anniversario %{date}."
+      other: "%{actors} ha lor anniversario %{date}."
+      zero: "%{actors} ha lor anniversario %{date}."
     index:
       all_notifications: "Tote le notificationes"
       also_commented: "Etiam commentava"

config/locales/diaspora/sc.yml

@@ -593,9 +593,11 @@ sc:
       byline: "Su mundu sotziale in lìnia in ue tenes su controllu"
       choose_your_audience: "Issèbera su pùblicu tuo"
       choose_your_audience_info: "Sas caras de diaspora* ti permitint de cumpartzire cun petzi cussas persones cun las cales cheres tue. Podes èssere pùblicu o privadu cantu cheres. Cumpartzire una fotografia ispassiosa cun totu su mundu, o unu segretu de importu cun petzi sos amigos tuos. Tenes tue su controllu."
+      diaspora_site_link: "retza federada de diaspora*"
       headline: "Bene bènnidu in %{pod_name}"
       own_your_data: "Sos datos tuos sunt petzi tuos"
       own_your_data_info: "Medas retzas sotziales impreant sos datos tuos pro fàghere dinare analizende sas interatziones tuas pro ti bèndere cosa. diaspora* no impreat sos datos tuos pro cale si siat punna chi non siet sa de ti permìtere de ti connètere e de cumpartzire cun sos àteros."
+      part_of_diaspora: "Parte de su %{diaspora_site_link}"
     podmin:
       byline: "Istas pro cambiare ìnternet. Incumintzamus, ite naras?"
       configuration_info: "Aberi %{database_path} e %{diaspora_path} in s'editore de testu preferidu dae tie e revisiona·los cun atentzione. Sunt cummentados estensivamente."
@@ -989,6 +991,11 @@ sc:
       updated: "Profilu agiornadu"
   public: "Pùblicu"
   registrations:
+    closed:
+      another_pod: "un'àteru pod"
+      closed_pod: "Custu pod est, in custu momentu, serradu pro sas registratziones noas. Nointames, ti podes aunire su matessi a sa retza de diaspora* registrende·ti in %{wiki}. Essende totu sos pods connessos intre issos, as a tènnere atzessu a sos matessi cuntenutos in cue."
+      find_pods: "Podes agatare una lista de pods in ue ti podes registrare in %{poduptime}"
+      other_questions: "Si tenes cale si siat àtera pregunta chi pertocat a s'issèberu de unu pod, leghe·ti sa %{wiki} nostra"
     create:
       success: "Ti ses registradu in diaspora*!"
     invalid_invite: "Su ligàmene de invitu chi as impreadu no est prus vàlidu!"
@@ -1175,6 +1182,41 @@ sc:
         one: "1 persone etichetadas cun %{tag}"
         other: "%{count} persones etichetadas cun %{tag}"
         zero: "Nemos etichetadu cun %{tag}"
+  two_factor_auth:
+    activated:
+      change_button: "Disativa"
+      change_label: "Disativa s'autenticatzione in duas fases insertende sa crae de intrada tua"
+      status: "Autenticatzione in duas fases ativada"
+    confirm:
+      activate_button: "Cunfirma e ativa"
+      input_explanation: "A pustis de s'iscansidura o de s'insertadura de su còdighe segretu, inserta su còdighe de ses tzifras chi as a bìdere e cunfirma s'impostatzione."
+      input_title: "Cunfirma cun unu getone TOTP"
+      manual_explanation: "S'in casu mai non potzas iscansire su còdighe QR in manera automàtica podes insertare su còdighe segretu manualmente in s'aplicatzione."
+      manual_explanation_cont: "Semus impreende craes de intrada bàlidas pro una borta ebbia (TOTP) basadas subra su tempus cun getones a ses tzifras. S'in casu mai s'aplicatzione tua ti pedat un'intervallu de tempus e un's'algoritmu, inserta pare-pare 30 segundos e sha1. <br /> Sos ispàtzios bi sunt pro leghibilidade ebbia, inserta su còdighe chene de issos."
+      scan_explanation: "Pro praghere iscansi su còdighe QR cun un'aplicatzione cun capatzidade TOTP, che a andOTP (Android), FreeOTP (iOS), SailOTP (SailfishOS)."
+      scan_title: "Iscansi su còdighe QR"
+      status: "S'autenticatzione in duas fases no est galu ativada de su totu, depes cunfirmare s'ativatzione cun unu getone TOTP"
+      title: "Cunfirma s'ativatzione"
+    deactivated:
+      change_button: "Ativa"
+      change_label: "Ativa s'autenticatzione in duas fases"
+      status: "Autenticatzione in duas fases disativada"
+    explanation: "S'autenticatzione in duas fases est una manera poderosa pro t'assegurare de èssere s'ùnicu in gradu de atzèdere a su contu tuo. Cando faghes s'atzessu, inserta unu còdighe de 6 tzifras in paris cun sa crae tua pro dimustrare s'identidade tua. Dae cara: si perdes su telèfonu e sos còdighes de riprìstinu creados cando ativas custa funtzionalidade, as a tènnere s'atzessu a su contu de diaspora* tuo blocadu pro semper."
+    flash:
+      error_token: "Su getone fiat non curretu o non vàlidu"
+      success_activation: "Autenticatzione in duas fases ativada chene problemas"
+      success_deactivation: "Autenticatzione in duas fases disativada chene problemas"
+    input_token:
+      label: "Getone in duas fases"
+      placeholder: "getone in duas fases a ses tzifras"
+    recovery:
+      button: "Ingendra còdighes de recùperu noos"
+      explanation: "S'in casu mai as a pèrdere s'atzessu a su telèfonu tuo as a pòdere impreare unu de sos còdighes de recùperu inoghe in suta pro torrare a otènnere s'atzessu a su contu tuo. Ampara bene sos còdighes de recùperu. Pro fàghere un'esèmpiu, los dias pòdere imprentare e pònnere cun àteros documentos de importu."
+      explanation_short: "Sos còdighes de recùperu ti permitint de torrare a otènnere s'atzessu a su contu tuo si as pèrdidu su telèfonu tuo. Ammenta·ti chi podes impreare cada còdighe de recùperu una borta ebbia."
+      invalidation_notice: "Si as pèrdidu sos còdighes de recùperu tuos, los podes torrare a ingendrare inoghe. Sos còdighes de recùperu betzos ant a èssere invalidados."
+      reminder: "Si nono, podes impreare unu de sos còdighes de recùperu."
+      title: "Còdighes de recùperu"
+    title: "Autenticatzione in duas fases"
   username: "Nùmene impreadore"
   users:
     confirm_email:

config/locales/diaspora/th.yml

@@ -16,6 +16,7 @@ th:
   cancel: "ยกเลิก"
   delete: "ลบ"
   email: "อีเมล"
+  fill_me_out: "โปรดเติมข้อมูลให้สมบูรณ์"
   limited: "จำกัดการเข้าถึง"
   ok: "ตกลง"
   privacy: "ส่วนตัว"

config/locales/javascript/javascript.et.yml

@@ -43,7 +43,13 @@ et:
     show_more: "näita veel"
     stream:
       comment: "Kommenteeri"
+      disable_post_notifications: "Lülita selle postituse teavitused välja"
+      enable_post_notifications: "Lülita selle postituse teavitused sisse"
       follow: "Jälgi"
+      followed_tag:
+        add_a_tag: "Lisa silt"
+        follow: "Jälgi"
+        title: "#Jälgitavad sildid"
       hide: "Peida"
       hide_nsfw_posts: "Peida #nsfw postitused"
       like: "Meeldib"
@@ -56,7 +62,9 @@ et:
         one: "Näita veel <%= count %> kommentaari"
         other: "Näita veel <%= count %> kommentaari"
         zero: "Näita veel <%= count %> kommentaari"
+      no_posts_yet: "Ei ole veel kuvamiseks postitusi."
       original_post_deleted: "Postitus on autori poolt eemaldatud."
+      permalink: "Püsiviide"
       public: "Avalik"
       reshare: "Jaga edasi"
       reshares:
@@ -65,6 +73,11 @@ et:
         zero: "<%= count %> edasijagamist"
       show_nsfw_post: "Näita postitust"
       show_nsfw_posts: "Näita kõiki"
+      tags:
+        follow: "Jälgi #<%= tag %>"
+        following: "Jälgin #<%= tag %>"
+        stop_following: "Lõpeta #<%= tag %> jälgimine"
+        stop_following_confirm: "Lõpeta sildi #<%= tag %> jälgimine?"
       unfollow: "Lõpeta jälgimine"
       unlike: "Ei meeldi"
     tags:

spec/integration/tag_people_spec.rb

@@ -14,7 +14,7 @@ describe TagsController, type: :request do
       get "/tags/#{tag}"
 
       expect(response.status).to eq(200)
-      expect(response.body).to match(/div class="pagination"/)
+      expect(response.body).to match(/class="pagination"/)
       expect(response.body).to match(/href="\/tags\/#{tag}\?page=2"/)
     end
 

spec/models/profile_spec.rb

@@ -124,6 +124,18 @@ describe Profile, :type => :model do
     end
   end
 
+  describe "of gender" do
+    it "can be 255 characters long" do
+      profile = FactoryGirl.build(:profile, gender: "a" * 255)
+      expect(profile).to be_valid
+    end
+
+    it "cannot be 256 characters" do
+      profile = FactoryGirl.build(:profile, gender: "a" * 256)
+      expect(profile).not_to be_valid
+    end
+  end
+
   describe "image_url setters" do
     %i(image_url image_url_small image_url_medium).each do |method|
       describe "##{method}=" do