tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- config/locales/simple_form.ja.yml

Not a real conflict, one new string was introduced in
glitch and one in upstream.
This commit is contained in:
Thibaut Girka
2018-10-29 14:00:41 +01:00
parent 7f22ed0fc9 32f950a7a8
commit a942ad3062
114 changed files with 1495 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Gemfile.lock
View File

@ -1,7 +1,8 @@
GIT
remote: https://github.com/Gargron/i18n-tasks.git
revision: ab6e10878ccdb6243f934f30372276d260c14251
ref: ab6e10878ccdb6243f934f30372276d260c14251
remote: https://github.com/glebm/i18n-tasks.git
revision: a1c9089b4ffed4f33e3b3a1bb2378d7a23445c0f
ref: a1c9089b4ffed4f33e3b3a1bb2378d7a23445c0f
branch: master
specs:
i18n-tasks (0.9.27)
activesupport (>= 4.0.2)
@ -199,7 +200,7 @@ GEM
docile (1.3.0)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
doorkeeper (5.0.1)
doorkeeper (5.0.2)
railties (>= 4.2)
dotenv (2.5.0)
dotenv-rails (2.5.0)
@ -395,7 +396,7 @@ GEM
av (~> 0.9.0)
paperclip (>= 2.5.2)
parallel (1.12.1)
parallel_tests (2.25.0)
parallel_tests (2.26.0)
parallel
parser (2.5.1.2)
ast (~> 2.4.0)
@ -530,15 +531,15 @@ GEM
rspec-core (~> 3.0, >= 3.0.0)
sidekiq (>= 2.4.0)
rspec-support (3.8.0)
rubocop (0.59.2)
rubocop (0.60.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.9.0)
unicode-display_width (~> 1.4.0)
ruby-progressbar (1.10.0)
ruby-saml (1.9.0)
nokogiri (>= 1.5.10)
rufus-scheduler (3.5.2)
@ -627,7 +628,7 @@ GEM
unf (~> 0.1.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
tzinfo-data (1.2018.6)
tzinfo-data (1.2018.7)
tzinfo (>= 1.0.0)
unf (0.1.4)
unf_ext
@ -726,7 +727,7 @@ DEPENDENCIES
ox (~> 2.10)
paperclip (~> 6.0)
paperclip-av-transcoder (~> 0.6)
parallel_tests (~> 2.25)
parallel_tests (~> 2.26)
pg (~> 1.1)
pghero (~> 2.2)
pkg-config (~> 1.3)
@ -750,7 +751,7 @@ DEPENDENCIES
rqrcode (~> 0.10)
rspec-rails (~> 3.8)
rspec-sidekiq (~> 3.0)
rubocop (~> 0.59)
rubocop (~> 0.60)
sanitize (~> 4.6)
scss_lint (~> 0.57)
sidekiq (~> 5.2)