Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
pleroma
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Cevado
pleroma
Commits
1629fa24
Commit
1629fa24
authored
Jan 10, 2020
by
lain
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/1.1.8' into 'stable'
Release/1.1.8 See merge request
pleroma/pleroma!2096
parents
ecb3386f
e372917f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
4 deletions
+12
-4
CHANGELOG.md
CHANGELOG.md
+6
-0
config/config.exs
config/config.exs
+3
-1
mix.exs
mix.exs
+2
-2
mix.lock
mix.lock
+1
-1
No files found.
CHANGELOG.md
View file @
1629fa24
...
...
@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
The format is based on
[
Keep a Changelog
](
https://keepachangelog.com/en/1.0.0/
)
.
## [1.1.8] - 2020-01-10
### Fixed
-
Captcha generation issues
-
Returned Kocaptcha endpoint to configuration
-
Captcha validity is now 5 minutes
## [1.1.7] - 2019-12-13
### Fixed
-
OTP: Inability to set the upload limit
...
...
config/config.exs
View file @
1629fa24
...
...
@@ -53,9 +53,11 @@
config
:pleroma
,
Pleroma
.
Captcha
,
enabled:
true
,
seconds_valid:
6
0
,
seconds_valid:
30
0
,
method:
Pleroma
.
Captcha
.
Native
config
:pleroma
,
Pleroma
.
Captcha
.
Kocaptcha
,
endpoint:
"https://captcha.kotobank.ch"
config
:pleroma
,
:hackney_pools
,
federation:
[
max_connections:
50
,
...
...
mix.exs
View file @
1629fa24
...
...
@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
def
project
do
[
app:
:pleroma
,
version:
version
(
"1.1.
7
"
),
version:
version
(
"1.1.
8
"
),
elixir:
"~> 1.7"
,
elixirc_paths:
elixirc_paths
(
Mix
.
env
()),
compilers:
[
:phoenix
,
:gettext
]
++
Mix
.
compilers
(),
...
...
@@ -160,7 +160,7 @@ defp deps do
{
:flake_id
,
"~> 0.1.0"
},
{
:captcha
,
git:
"https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git"
,
ref:
"
c3c795c55f6b49d79d6ac70a0f91e525099fc3e2
"
},
ref:
"
e0f16822d578866e186a0974d65ad58cddc1e2ab
"
},
{
:mox
,
"~> 0.5"
,
only:
:test
}
]
++
oauth_deps
()
end
...
...
mix.lock
View file @
1629fa24
...
...
@@ -8,7 +8,7 @@
"bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm"},
"cachex": {:hex, :cachex, "3.0.3", "4e2d3e05814a5738f5ff3903151d5c25636d72a3527251b753f501ad9c657967", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm"},
"calendar": {:hex, :calendar, "0.17.6", "ec291cb2e4ba499c2e8c0ef5f4ace974e2f9d02ae9e807e711a9b0c7850b9aee", [:mix], [{:tzdata, "~> 0.5.20 or ~> 0.1.201603 or ~> 1.0", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm"},
"captcha": {:git, "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git", "
c3c795c55f6b49d79d6ac70a0f91e525099fc3e2", [ref: "c3c795c55f6b49d79d6ac70a0f91e525099fc3e2
"]},
"captcha": {:git, "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git", "
e0f16822d578866e186a0974d65ad58cddc1e2ab", [ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab
"]},
"certifi": {:hex, :certifi, "2.5.1", "867ce347f7c7d78563450a18a6a28a8090331e77fa02380b4a21962a65d36ee5", [:rebar3], [{:parse_trans, "~>3.3", [hex: :parse_trans, repo: "hexpm", optional: false]}], "hexpm"},
"combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm"},
"comeonin": {:hex, :comeonin, "4.1.2", "3eb5620fd8e35508991664b4c2b04dd41e52f1620b36957be837c1d7784b7592", [:mix], [{:argon2_elixir, "~> 1.2", [hex: :argon2_elixir, repo: "hexpm", optional: true]}, {:bcrypt_elixir, "~> 0.12.1 or ~> 1.0", [hex: :bcrypt_elixir, repo: "hexpm", optional: true]}, {:pbkdf2_elixir, "~> 0.12", [hex: :pbkdf2_elixir, repo: "hexpm", optional: true]}], "hexpm"},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment