Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
mastofe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Pleroma
mastofe
Commits
907ebcfd
Unverified
Commit
907ebcfd
authored
5 years ago
by
ThibG
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #1291 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
parents
e1d29f7d
427ef494
Branches
Branches containing commit
Tags
Tags containing commit
Loading
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Gemfile.lock
+8
-8
8 additions, 8 deletions
Gemfile.lock
app/models/account.rb
+10
-1
10 additions, 1 deletion
app/models/account.rb
lib/mastodon/redis_config.rb
+3
-1
3 additions, 1 deletion
lib/mastodon/redis_config.rb
lib/tasks/mastodon.rake
+14
-1
14 additions, 1 deletion
lib/tasks/mastodon.rake
with
35 additions
and
11 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
