Browse Source

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

Conflicts:
- README.md: kept our version
Thibaut Girka 3 weeks ago
parent
commit
42713b9710

+ 14
- 0
CHANGELOG.md View File

@@ -3,6 +3,20 @@ Changelog
3 3
 
4 4
 All notable changes to this project will be documented in this file.
5 5
 
6
+## [2.7.1] - 2019-01-28
7
+### Fixed
8
+
9
+- Fix SSO authentication not working due to missing agreement boolean ([Gargron](https://github.com/tootsuite/mastodon/pull/9915))
10
+- Fix slow fallback of CopyAccountStats migration setting stats to 0 ([Gargron](https://github.com/tootsuite/mastodon/pull/9930))
11
+- Fix wrong command in migration error message ([angristan](https://github.com/tootsuite/mastodon/pull/9877))
12
+- Fix initial value of volume slider in video player and handle volume changes ([ThibG](https://github.com/tootsuite/mastodon/pull/9929))
13
+- Fix missing hotkeys for notifications ([ThibG](https://github.com/tootsuite/mastodon/pull/9927))
14
+- Fix being able to attach unattached media created by other users ([ThibG](https://github.com/tootsuite/mastodon/pull/9921))
15
+- Fix unrescued SSL error during link verification ([renatolond](https://github.com/tootsuite/mastodon/pull/9914))
16
+- Fix Firefox scrollbar color regression ([trwnh](https://github.com/tootsuite/mastodon/pull/9908))
17
+- Fix scheduled status with media immediately creating a status ([ThibG](https://github.com/tootsuite/mastodon/pull/9894))
18
+- Fix missing strong style for landing page description ([Kjwon15](https://github.com/tootsuite/mastodon/pull/9892))
19
+
6 20
 ## [2.7.0] - 2019-01-20
7 21
 ### Added
8 22
 

+ 3
- 1
CONTRIBUTING.md View File

@@ -35,7 +35,7 @@ CONTRIBUTING
35 35
 =======
36 36
 Contributing
37 37
 
38
-Thank you for considering contributing to Mastodon 🐘 
38
+Thank you for considering contributing to Mastodon 🐘
39 39
 
40 40
 You can contribute in the following ways:
41 41
 
@@ -44,6 +44,8 @@ You can contribute in the following ways:
44 44
 - Contributing code to Mastodon by fixing bugs or implementing features
45 45
 - Improving the documentation
46 46
 
47
+If your contributions are accepted into Mastodon, you can request to be paid through [our OpenCollective](https://opencollective.com/mastodon).
48
+
47 49
 ## Bug reports
48 50
 
49 51
 Bug reports and feature suggestions can be submitted to [GitHub Issues](https://github.com/tootsuite/mastodon/issues). Please make sure that you are not submitting duplicates, and that a similar report or request has not already been resolved or rejected in the past using the search function. Please also use descriptive, concise titles.

+ 1
- 1
db/migrate/20181116173541_copy_account_stats.rb View File

@@ -44,7 +44,7 @@ class CopyAccountStats < ActiveRecord::Migration[5.2]
44 44
     # uniqueness violations that we need to skip over
45 45
     Account.unscoped.select('id, statuses_count, following_count, followers_count, created_at, updated_at').find_each do |account|
46 46
       begin
47
-        params = [[nil, account.id], [nil, account.statuses_count], [nil, account.following_count], [nil, account.followers_count], [nil, account.created_at], [nil, account.updated_at]]
47
+        params = [[nil, account.id], [nil, account[:statuses_count]], [nil, account[:following_count]], [nil, account[:followers_count]], [nil, account.created_at], [nil, account.updated_at]]
48 48
         exec_insert('INSERT INTO account_stats (account_id, statuses_count, following_count, followers_count, created_at, updated_at) VALUES ($1, $2, $3, $4, $5, $6)', nil, params)
49 49
       rescue ActiveRecord::RecordNotUnique
50 50
         next

+ 1
- 1
lib/mastodon/migration_helpers.rb View File

@@ -889,7 +889,7 @@ table #{table}.
889 889
 If you are using PostgreSQL you can solve this by logging in to the GitLab
890 890
 database (#{dbname}) using a super user and running:
891 891
 
892
-    ALTER #{user} WITH SUPERUSER
892
+    ALTER USER #{user} WITH SUPERUSER
893 893
 
894 894
 For MySQL you instead need to run:
895 895
 

+ 1
- 1
lib/mastodon/version.rb View File

@@ -13,7 +13,7 @@ module Mastodon
13 13
     end
14 14
 
15 15
     def patch
16
-      0
16
+      1
17 17
     end
18 18
 
19 19
     def pre

Loading…
Cancel
Save