Upgrade plume dependencies (#332)
* Bump base64 from 0.9.3 to 0.10.0 * Bump bcrypt from 0.2.0 to 0.2.1 * Bump canapi from 0.1.0 to 0.2.0 * Bump failure from 0.1.2 to 0.1.3 * Bump hyper from 0.11.27 to 0.12.11 * Bump hyper from 0.11.27 to 0.12.16 * Bump lazy_static from 1.1.0 to 1.2.0 * Bump multipart from 0.15.3 to 0.15.4 * Bump openssl from 0.10.12 to 0.10.15 * Bump pulldown-cmark from 0.1.2 to 0.2.0 * Bump reqwest from 0.9.2 to 0.9.5 * Bump rocket from 0.4.0-rc.1 to 0.4.0 * Bump rpassword from 2.0.0 to 2.1.0 * Bump ructe from 0.5.2 to 0.5.4 * Bump serde_derive from 1.0.79 to 1.0.80 * Bump serde from 1.0.79 to 1.0.80 * Bump serde_json from 1.0.32 to 1.0.33 * Bump tera from 0.11.17 to 0.11.20 * Bump url from 1.7.1 to 1.7.2 * Bump validator to from 0.7.2 to 0.8.0 * Bump validator_derive from 0.7.2 to 0.8.0 * Bump whatlang from 0.5.0 to 0.6.0 * Remove hyper from plume-common dependencies * Remove rpassword from Plume dependancies * Upgrade compiler to nightly-2018-12-06
This commit is contained in:
@@ -23,7 +23,6 @@ extern crate rocket_contrib;
|
||||
extern crate rocket_csrf;
|
||||
#[macro_use]
|
||||
extern crate rocket_i18n;
|
||||
extern crate rpassword;
|
||||
extern crate scheduled_thread_pool;
|
||||
extern crate serde;
|
||||
#[macro_use]
|
||||
|
||||
+1
-1
@@ -120,7 +120,7 @@ pub fn create(conn: DbConn, form: LenientForm<NewBlogForm>, user: User, intl: I1
|
||||
|
||||
Ok(Redirect::to(uri!(details: name = slug.clone())))
|
||||
} else {
|
||||
Err(render!(blogs::new(
|
||||
Err(render!(blogs::new(
|
||||
&(&*conn, &intl.catalog, Some(user)),
|
||||
&*form,
|
||||
errors
|
||||
|
||||
@@ -145,7 +145,7 @@ pub fn update_settings(conn: DbConn, admin: Admin, form: LenientForm<InstanceSet
|
||||
form.long_description.clone());
|
||||
Redirect::to(uri!(admin))
|
||||
})
|
||||
.map_err(|e| {
|
||||
.map_err(|e| {
|
||||
let local_inst = Instance::get_local(&*conn).expect("instance::update_settings: local instance not found");
|
||||
render!(instance::admin(
|
||||
&(&*conn, &intl.catalog, Some(admin.0)),
|
||||
|
||||
+2
-2
@@ -262,7 +262,7 @@ pub fn update(blog: String, slug: String, user: User, conn: DbConn, form: Lenien
|
||||
}
|
||||
} else {
|
||||
let medias = Media::for_user(&*conn, user.id);
|
||||
let temp = render!(posts::new(
|
||||
let temp = render!(posts::new(
|
||||
&(&*conn, &intl.catalog, Some(user)),
|
||||
b,
|
||||
true,
|
||||
@@ -382,7 +382,7 @@ pub fn create(blog_name: String, form: LenientForm<NewPostForm>, user: User, con
|
||||
}
|
||||
} else {
|
||||
let medias = Media::for_user(&*conn, user.id);
|
||||
Err(Some(render!(posts::new(
|
||||
Err(Some(render!(posts::new(
|
||||
&(&*conn, &intl.catalog, Some(user)),
|
||||
blog,
|
||||
false,
|
||||
|
||||
@@ -83,7 +83,7 @@ pub fn create(conn: DbConn, form: LenientForm<LoginForm>, flash: Option<FlashMes
|
||||
|
||||
let uri = Uri::parse(&destination)
|
||||
.map(|x| x.into_owned())
|
||||
.map_err(|_| render!(session::login(
|
||||
.map_err(|_| render!(session::login(
|
||||
&(&*conn, &intl.catalog, None),
|
||||
None,
|
||||
&*form,
|
||||
|
||||
+1
-1
@@ -333,7 +333,7 @@ pub fn create(conn: DbConn, form: LenientForm<NewUserForm>, intl: I18n) -> Resul
|
||||
).update_boxes(&*conn);
|
||||
Redirect::to(uri!(super::session::new))
|
||||
})
|
||||
.map_err(|err| {
|
||||
.map_err(|err| {
|
||||
render!(users::new(
|
||||
&(&*conn, &intl.catalog, None),
|
||||
Instance::get_local(&*conn).map(|i| i.open_registrations).unwrap_or(true),
|
||||
|
||||
Reference in New Issue
Block a user