Merge branch 'master' into 'expired_member' (9b5985aa) · Commits · Ash / Discord Bot · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Discord Bot
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Environments
- 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 in our documentation.

Ash
Discord Bot
Commits
9b5985aa

Commit 9b5985aa authored 5 years ago by

tec

Downloads
- Plain Diff

Merge branch 'master' into 'expired_member'

# Conflicts:
#   src/ldap.rs

parents 9b26653c 62de747a

Pipeline #242 failed with stages

Changes 10
Pipelines 1

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 0 additions, 1 deletion

.gitignore
Cargo.lock 2531 additions, 0 deletions

Cargo.lock
src/config.rs 6 additions, 6 deletions

src/config.rs
src/config.ucc.yml 14 additions, 0 deletions

src/config.ucc.yml
src/ldap.rs 2 additions, 2 deletions

src/ldap.rs
src/main.rs 41 additions, 6 deletions

src/main.rs
src/reaction_roles.rs 12 additions, 3 deletions

src/reaction_roles.rs
src/token_management.rs 2 additions, 2 deletions

src/token_management.rs
src/user_management.rs 16 additions, 5 deletions

src/user_management.rs
src/voting.rs 6 additions, 8 deletions

src/voting.rs

with 2630 additions and 33 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