Commit 630ff574 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

parents 893a68ba 1708b6cd
...@@ -37,7 +37,7 @@ v 7.8.0 ...@@ -37,7 +37,7 @@ v 7.8.0
- -
- -
- -
- - Password reset token validity increased from 2 hours to 2 days since it is also send on account creation.
- -
- -
- -
......
...@@ -145,7 +145,8 @@ Devise.setup do |config| ...@@ -145,7 +145,8 @@ Devise.setup do |config|
# Time interval you can reset your password with a reset password key. # Time interval you can reset your password with a reset password key.
# Don't put a too small interval or your users won't have the time to # Don't put a too small interval or your users won't have the time to
# change their passwords. # change their passwords.
config.reset_password_within = 2.hours # When someone else invites you to GitLab this time is also used so it should be pretty long.
config.reset_password_within = 2.days
# ==> Configuration for :encryptable # ==> Configuration for :encryptable
# Allow you to use another encryption algorithm besides bcrypt (default). You can use # Allow you to use another encryption algorithm besides bcrypt (default). You can use
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
- [Public access](public_access/public_access.md) Learn how you can allow public and internal access to projects. - [Public access](public_access/public_access.md) Learn how you can allow public and internal access to projects.
- [SSH](ssh/README.md) Setup your ssh keys and deploy keys for secure access to your projects. - [SSH](ssh/README.md) Setup your ssh keys and deploy keys for secure access to your projects.
- [Web hooks](web_hooks/web_hooks.md) Let GitLab notify you when new code has been pushed to your project. - [Web hooks](web_hooks/web_hooks.md) Let GitLab notify you when new code has been pushed to your project.
- [Workflow](workflow/README.md) Learn how to get the maximum out of GitLab. - [Workflow](workflow/README.md) Using GitLab functionality and importing projects from GitHub and SVN.
## Administrator documentation ## Administrator documentation
......
# Workflow # Workflow
- [Workflow](workflow.md) - [Feature branch workflow](workflow.md)
- [Project Features](project_features.md) - [Project Features](project_features.md)
- [Authorization for merge requests](authorization_for_merge_requests.md) - [Authorization for merge requests](authorization_for_merge_requests.md)
- [Groups](groups.md) - [Groups](groups.md)
......
# Workflow # Feature branch workflow
1. Clone project: 1. Clone project:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment