Jenkins
ae55717f50
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi
6daa722e87
Revert "Revert "Upgrade Paperclip to version 6.0.0" ( #6807 )" ( #6808 )
...
This reverts commit d35272245e
.
7 years ago
Jenkins
b1453c0dbf
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko
59b3b38b0e
Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env ( #6845 )
...
Fix #6816 , fix #6790
7 years ago
Jenkins
eba1b109db
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Alexander
af08f6042d
rename pam email environment variable to something more understandable and default to LOCAL_DOMAIN (better fallback) ( #6833 )
7 years ago
Eugen Rochko
d35272245e
Revert "Upgrade Paperclip to version 6.0.0" ( #6807 )
...
* Revert "Bump version to 2.3.2rc1"
This reverts commit 64d5c8a512
.
* Revert "Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806 )"
This reverts commit 36734278ba
.
* Revert "Handle Mastodon::HostValidationError when pulling remoteable assets (#6782 )"
This reverts commit 8f374100ed
.
* Revert "Correct the reference to user's password in mastodon:add_user task (#6800 )"
This reverts commit 7b247b15f2
.
* Revert "Upgrade Paperclip to version 6.0.0 (#6754 )"
This reverts commit cd6dee83a1
.
7 years ago
Yamagishi Kazutoshi
cd6dee83a1
Upgrade Paperclip to version 6.0.0 ( #6754 )
7 years ago
Jenkins
54608d0486
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Effy Elden
4a8046df66
Add additional first_name and last_name SAML attribute statement options, and modify Omniauthable concern to use full_name or first_name + last_name if not available ( #6669 )
7 years ago
David Yip
c08c971dd3
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
README.md
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/serializers/rest/instance_serializer.rb
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.ja.yml
7 years ago
Alexander
988f6505e4
fix logic for pam_controlled_service ( #6599 )
7 years ago
Eugen Rochko
9721b7746a
Fix #942 : Seamless LDAP login ( #6556 )
7 years ago
Akihiko Odaki
a5a434a8f6
Raise Mastodon::HostValidationError when host for HTTP request is private ( #6410 )
7 years ago
imncls
c0aabbec0f
Merge branch 'master' of https://github.com/tootsuite/mastodon
...
# Conflicts:
# app/controllers/settings/exports_controller.rb
# app/models/media_attachment.rb
# app/models/status.rb
# app/views/about/show.html.haml
# docker_entrypoint.sh
# spec/views/about/show.html.haml_spec.rb
7 years ago
Ghislain Loaec
d1806f5dc4
New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML strategies) ( #6540 )
7 years ago
Ghislain Loaec
deea524052
New env variable: SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED + fixes #6533 ( #6538 )
7 years ago
Eugen Rochko
2815ef6d7f
Fix #6509 : Use pull queue for chewy jobs ( #6513 )
7 years ago
Jenkins
bcd435effe
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Daniel King
845ea13622
Fix URLs incorrectly having trailing hyphen removed ( #6465 )
...
In cases where a URL has a trailing hyphen the FetchLinkCardService incorrectly removes the hyphen when it is parsed
The hyphen is not a reserved character in the URI spec https://tools.ietf.org/html/rfc3986#section-2.2
7 years ago
Eugen Rochko
cd925c11e3
Fix Chewy trying to update index with the wrong strategy ( #6464 )
7 years ago
Jenkins
3a1f58e9eb
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko
7ca5a06505
Full-text search for authorized statuses ( #6423 )
...
* Add full-text search for authorized statuses
- Search API will return statuses that match the query
- Only for logged in users
- Only if you are author of the status,
- Or you were mentioned in it
- Or you favourited or reblogged it
- Configuration over `ES_ENABLED`, `ES_HOST`, `ES_PORT`, `ES_PREFIX`
- Run `rails chewy:deploy` to create & populate index
Fix #5880
Fix #4293
Fix #1152
* Add commented out docker-compose configuration for ES container
* Optimize index import, filter search results
* Add basic normalization to the index
* Add better stemming and normalization to the index
* Skip webfinger request if search query includes both @ and a space
* Fix code style
* Visually separate search result sections
* Fix code style issues
7 years ago
David Yip
4f8122a98c
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
.env.production.sample
app/controllers/auth/confirmations_controller.rb
db/schema.rb
7 years ago
Eugen Rochko
555e7205da
Make PAM gem optional, allow configuration over environment ( #6415 )
7 years ago
Eugen Rochko
5322013f25
CAS + SAML authentication feature ( #6425 )
...
* Cas authentication feature
* Config
* Remove class_eval + Omniauth initializer
* Codeclimate review
* Codeclimate review 2
* Codeclimate review 3
* Remove uid/email reconciliation
* SAML authentication
* Clean up code
* Improve login form
* Fix code style issues
* Add locales
7 years ago
David Yip
6d1023b2e9
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
7 years ago
Alexander
23ce0c86da
pam authentication ( #5303 )
...
* add pam support, without extra column
* bugfixes for pam login
* document options
* fix code style
* fix codestyle
* fix tests
* don't call remember_me without password
* fix codestyle
* improve checks for pam usage (should fix tests)
* fix remember_me part 1
* add remember_token column because :rememberable requires either a password or this column.
* migrate db for remember_token
* move pam_authentication to the right place, fix logic bug in edit.html.haml
* fix tests
* fix pam authentication, improve username lookup, add comment
* valid? is sometimes not honored, return nil instead trying to authenticate with pam
* update devise_pam_authenticatable2 and adjust code. Fixes sideeffects observed in tests
* update devise_pam_authenticatable gem, fixes for codeconventions, fix finding user
* codeconvention fixes
* code convention fixes
* fix idention
* update dependency, explicit conflict check
* fix disabled password updates if in pam mode
* fix check password if password is present, fix templates
* block registration if account is maintained by pam
* Revert "block registration if account is maintained by pam"
This reverts commit 8e7a083d650240b6fac414926744b4b90b435f20.
* fix identation error introduced by rebase
* block usernames maintained by pam
* document pam settings better
* fix code style
7 years ago
David Yip
de7283a318
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
Gemfile.lock
7 years ago
Eugen Rochko
9613c3238c
HTML e-mails for UserMailer ( #6256 )
...
- premailer gem to turn CSS into inline styles automatically
- rework UserMailer templates
- reword UserMailer templates
7 years ago
Jenkins
6e821c4273
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel
2a27afc656
Suppress CSRF token warnings ( #6240 )
...
CSRF token checking was enabled for API controllers in #6223 ,
producing "Can't verify CSRF token authenticity" log spam. This
disables logging of failed CSRF checks.
This also changes the protection strategy for
PushSubscriptionsController to use exceptions, making it consistent
with other controllers that use sessions.
7 years ago
David Yip
1a7f8eb723
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
db/schema.rb
7 years ago
Eugen Rochko
b7b0f630a0
Increase rate limit on protected paths ( #6229 )
...
Previously each protected path had a separate rate limit. Now they're all in the same bucket, so people are more likely to hit one with register->login. Increasing to 25 per 5 minutes should be fine.
7 years ago
Jenkins
86007e913d
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Naoki Kosaka
3bc13de62f
Fix enforce HTTPS in production. ( #6180 )
7 years ago
Jenkins
b42e6973a1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel
3c20cfd734
Add confirmation step for email changes ( #6071 )
...
* Add confirmation step for email changes
This adds a confirmation step for email changes of existing users.
Like the initial account confirmation, a confirmation link is sent
to the new address.
Additionally, a notification is sent to the existing address when
the change is initiated. This message includes instruction to reset
the password immediately or to contact the instance admin if the
change was not initiated by the account owner.
Fixes #3871
* Add review fixes
7 years ago
Jenkins
9ccad78647
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
nightpool
e921778dd3
enforce LOCAL_HTTPS=true in production ( #6061 )
...
* enforce https in production
* note changes in production env sample
* typo fix
7 years ago
Jenkins
1366e96a02
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi
9dcead778c
Change streaming API URL when remote development ( #5942 )
...
* Change streaming API URL when remote development
* Use STREAMING_API_BASE_URL when dev env
7 years ago
David Yip
a56c9ac5dc
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko
31fe0d067b
Apply a 25x rate limit by IP even to authenticated requests ( #5948 )
7 years ago
kibigo!
f4c233f59f
Ruby intl8n for themes
7 years ago
Naoki Kosaka
77660c4624
Missing require 'authorization_decorator'. ( #5947 )
7 years ago
Eugen Rochko
87af0bf6cf
Rate limit by user instead of IP when API user is authenticated ( #5923 )
...
* Fix #668 - Rate limit by user instead of IP when API user is authenticated
* Fix code style issue
* Use request decorator provided by Doorkeeper
7 years ago
THE BOSS ♨
33b40397f8
Fix typo in paperclip.rb ( #5936 )
7 years ago
Yamagishi Kazutoshi
f76681ebd6
Revert fog-aws (ref #5604 ) ( #5934 )
7 years ago
Eugen Rochko
b037fbf9f4
Remove rabl dependency ( #5894 )
...
* Remove rabl dependency
* Replicate old Oj configuration
7 years ago