| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| | |
Disable "New Issue" and "New Merge Request" buttons when features are disabled in project settings
Closes #1676
See merge request !691
|
| | |
| |
| |
| |
| |
| | |
disabled in project settings
Closes #1676
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add support for Webhook note events
This MR adds support for note events (comments) for WebHooks.
Perhaps the only potential source of confusion is that the settings indicates "Note Events" instead of "Comments". What do you think?
Screenshot after:
Closes https://github.com/gitlabhq/gitlabhq/issues/6745
See merge request !673
|
| | |
| |
| |
| | |
Closes https://github.com/gitlabhq/gitlabhq/issues/6745
|
| |/
|
|
| |
Closes #1535
|
| | |
|
| |\ |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add explanation about WIP status to MR form.
See merge request !666
|
| | | | |
|
| | | | |
|
| | | | |
|
| |\ \ \ |
|
| | |/ / |
|
| |/ / |
|
| | | |
|
| |\ \ |
|
| | |/ |
|
| | | |
|
| |/
|
|
|
| |
Tell new users when their password reset token expires and provide a
link to get a new one.
|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix reference links in dashboard activity and ATOM feeds.
References like `@user` were not linked on the dashboard activity feed and in Atom feeds, because the reference parser depends on `@project` which isn't set in those situations.
This MR passes the project in question to the reference parsers in an option.
cc @rspeicher
See merge request !653
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Spin icon next to "Checking for CI status..."
Stationary spinners make me sad.
See merge request !655
|
| | |/ |
|
| | | |
|
| | | |
|
| |\ \ |
|
| | |/ |
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| | |
Protect OmniAuth request phase against CSRF.
Addresses #2268.
See merge request !1793
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | | |
Version check
See merge request !1509
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/admin/application_settings_controller.rb
app/views/admin/application_settings/_form.html.haml
db/schema.rb
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Show user roles by comments.
I think it would be useful to show the user's role (Owner/Master/Developer/Reporter) by comments on GitLab.com (like GitHub does with Owner/Collaborator). That way people will know that when someone from the project's core team comments, they're not just some random user, but they're actually on the team. Currently they have the gather this from context.
On hover, the note actions replace the role:
---
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2321.
cc @sytses
See merge request !639
|
| | | | | | |
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Restructure project sidebar and add more icons.
I moved the repository stuff down (including the clone bar), and the project/contribution stuff up. I also added more icons, to the sidebar and tabs on other pages.
---
See merge request !633
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | | |
|
| | |/ / / / |
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Two-factor authentication
Implement's Two-factor authentication using tokens.
- [X] Authentication logic
- [X] Enable/disable 2FA feature
- [x] Make 2-step login process if 2FA enabled
- [x] Backup codes
- [x] Backup code removed after being used
- [x] Check backup codes for mysql db (mention mysql limitation if applied)
- [x] Add tests
- [x] Test if https://github.com/tinfoil/devise-two-factor#disabling-automatic-login-after-password-resets applies, and address if so
- [x] Wait for fixed version of `attr_encrypted` or fork and use forked version - https://github.com/attr-encrypted/attr_encrypted/issues/155
Fixes http://feedback.gitlab.com/forums/176466-general/suggestions/4516817-implement-two-factor-authentication-2fa
See merge request !474
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This makes it consistent with the Invalid email/password error message
from the previous step.
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
