Merge branch 'master' into 'master' (4f9029f7) · Commits · Jan 0660 / Server · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Server
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Package Registry
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption, please take a look at our documentation.

Admin message

This instance is read-only!

Admin message

Currently restored from a November 2023 backup, read the 2023 data loss notice here or visit the new GitLab instance here.

Maintenance Mode

You are on a read-only GitLab instance.

Jan 0660
Server
Commits
4f9029f7

Commit 4f9029f7 authored 4 years ago by

insert

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Code cleanup/formatting

See merge request revolt/delta!2

parents f24d4784 bb73f905

Branches

Tags

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/database/entities/user.rs 26 additions, 13 deletions

src/database/entities/user.rs
src/notifications/events.rs 1 addition, 1 deletion

src/notifications/events.rs
src/notifications/websocket.rs 3 additions, 4 deletions

src/notifications/websocket.rs
src/routes/root.rs 3 additions, 1 deletion

src/routes/root.rs
src/routes/users/add_friend.rs 26 additions, 16 deletions

src/routes/users/add_friend.rs
src/routes/users/mod.rs 1 addition, 3 deletions

src/routes/users/mod.rs
src/routes/users/remove_friend.rs 1 addition, 4 deletions

src/routes/users/remove_friend.rs
src/routes/users/unblock_user.rs 1 addition, 6 deletions

src/routes/users/unblock_user.rs
src/util/variables.rs 4 additions, 10 deletions

src/util/variables.rs

with 66 additions and 58 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment