Douwe Maan
f58b17e20a
Render "Enterprise Edition" on help page with dark font.
2015-05-25 17:15:03 +02:00
Douwe Maan
bf29e33d5d
Rename issued_at to starts_at.
2015-05-21 19:50:57 +02:00
Douwe Maan
fda2b5adae
Only look at year before license was issued.
2015-05-21 19:15:43 +02:00
Douwe Maan
d180f40400
Validate maximum active user count up until license issue date.
2015-05-21 18:49:24 +02:00
Dmitriy Zaporozhets
1af8b1e4f8
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
...
Conflicts:
app/views/help/index.html.haml
lib/gitlab/git_access.rb
public/500.html
public/502.html
2015-05-15 13:29:58 +03:00
Douwe Maan
ac3d472ff4
Fix push event.
2015-05-15 12:11:16 +02:00
Dmitriy Zaporozhets
9c6f4a2351
Merge branch 'dashboard-references' into 'master'
...
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
2015-05-15 09:59:26 +00:00
Dmitriy Zaporozhets
de1aca131e
Merge branch 'spinner-spin' into 'master'
...
Spin icon next to "Checking for CI status..."
Stationary spinners make me sad.
See merge request !655
2015-05-15 09:57:24 +00:00
Robert Speicher
0ad9fc60ec
Enable 2FA for LDAP logins
2015-05-14 14:45:31 -04:00
Dmitriy Zaporozhets
3d4d89f060
Use count badges with number_with_delimiter helper for issue, commit count
2015-05-14 18:30:23 +03:00
Douwe Maan
191bb46d74
Use slightly fewer icons in project sidebar.
2015-05-14 17:02:00 +02:00
Dmitriy Zaporozhets
19251a1fc7
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-14 17:22:55 +03:00
Dmitriy Zaporozhets
c2ee828c19
Merge branch 'omniauth-csrf' into 'master'
...
Protect OmniAuth request phase against CSRF.
Addresses #2268 .
See merge request !1793
2015-05-14 14:22:26 +00:00
Douwe Maan
0b098060cc
Spin icon next to "Checking for CI status..."
2015-05-14 13:27:22 +02:00
Douwe Maan
cd52cef1c0
Fix reference links in dashboard activity and ATOM feeds.
2015-05-14 13:05:33 +02:00
Douwe Maan
74770137f6
Always show note action icons.
2015-05-14 12:18:19 +02:00
Dmitriy Zaporozhets
f32a045ef4
Merge branch 'version-check' into 'master'
...
Version check
See merge request !1509
2015-05-13 11:17:16 +00:00
Dmitriy Zaporozhets
b2d45bb544
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
...
Conflicts:
app/controllers/uploads_controller.rb
app/helpers/application_helper.rb
app/models/note.rb
app/services/test_hook_service.rb
db/schema.rb
spec/models/note_spec.rb
2015-05-13 14:10:14 +03:00
Dmitriy Zaporozhets
b0b25e37c9
Merge branch 'note-role' into 'master'
...
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
2015-05-12 11:28:39 +00:00
Dmitriy Zaporozhets
3b88a6e09e
Merge branch 'project-page' into 'master'
...
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
2015-05-12 10:19:49 +00:00
Douwe Maan
b0af379a22
Show user roles by comments.
2015-05-12 12:16:34 +02:00
Dmitriy Zaporozhets
4a373be861
Merge branch '2fa' into 'master'
...
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
2015-05-12 09:41:27 +00:00
Douwe Maan
87996ece06
Whoops.
2015-05-12 11:28:35 +02:00
Douwe Maan
4346c39ba9
Move "Forked from" above "Version".
2015-05-12 10:29:59 +02:00
Douwe Maan
a5ce66d836
Move clone panel to bottom of project sidebar.
2015-05-12 10:28:56 +02:00
Douwe Maan
bfe2384797
Restructure project sidebar.
2015-05-12 10:27:17 +02:00
Douwe Maan
e9dff9f410
Fix alignment of ref picker, breadcrumb and buttons.
2015-05-12 10:27:17 +02:00
Douwe Maan
71a1689fec
Add icons to more tabs.
2015-05-12 10:27:17 +02:00
Douwe Maan
5615f0397a
Tweak text.
2015-05-12 10:24:51 +02:00
Douwe Maan
aa4d199044
Fix commits feed button.
2015-05-10 00:39:20 +02:00
Robert Speicher
76873ce4a4
Move "invalid 2FA code" error message to the flash
...
This makes it consistent with the Invalid email/password error message
from the previous step.
2015-05-09 17:32:49 -04:00
Robert Speicher
3fb0fedd04
Autofocus the pin field on 2FA enable form
2015-05-09 17:32:49 -04:00
Robert Speicher
2ad1334d9e
Quotes, icon helper in profiles/accounts/show view
2015-05-09 17:32:24 -04:00
Robert Speicher
a4267033f2
Add a hint on login form about using a recovery code
2015-05-09 17:32:09 -04:00
Robert Speicher
8eb577ae98
Improve copy for enabling 2FA
2015-05-09 17:32:09 -04:00
Robert Speicher
4fca1fc5ab
Update copy for generating new recovery codes
2015-05-09 17:32:09 -04:00
Robert Speicher
32971b0af4
Refactor SessionsController
...
Also adds test case for providing an invalid 2FA code and then a valid
one without re-entering username and password.
2015-05-09 17:32:09 -04:00
Robert Speicher
6369d23d58
Fix nav and layout for TwoFactorAuthsController
2015-05-09 17:32:08 -04:00
Robert Speicher
c891ef9337
Add page titles for two_factor_auths views
2015-05-09 17:32:08 -04:00
Robert Speicher
6fa2942920
Update login views for two-factor auth
2015-05-09 17:31:40 -04:00
Robert Speicher
bd680999f9
Be consistent with what we call the 2FA feature
...
"Two-factor" vs. "2-Factor"
2015-05-09 17:31:39 -04:00
Robert Speicher
35b62facac
Update copy for recovery codes
2015-05-09 17:31:39 -04:00
Dmitriy Zaporozhets and Robert Speicher
8ae712ae28
Render 2fa recovery codes instead of downloading it
2015-05-09 17:31:39 -04:00
Dmitriy Zaporozhets and Robert Speicher
802fcd051f
Add support for backup codes
2015-05-09 17:31:37 -04:00
Dmitriy Zaporozhets and Robert Speicher
de9e1c3bad
Turn 2-factor authentication into 2 steps process. Disabled 2fa UI for ldap users since it is not supported
2015-05-09 17:31:10 -04:00
Dmitriy Zaporozhets and Robert Speicher
cde474a49f
Make 2 factor authentication work
2015-05-09 17:31:10 -04:00
Dmitriy Zaporozhets and Robert Speicher
ba7e2fd946
Create Two-factor authentication resource for user
2015-05-09 17:31:10 -04:00
Dmitriy Zaporozhets and Robert Speicher
7302395142
Init 2 factor authentication for user model
2015-05-09 17:31:07 -04:00
Douwe Maan
164d474488
Add Merge Request button to branches page.
2015-05-09 22:55:19 +02:00
Douwe Maan
722e393589
Add Create Merge Request buttons to commits page and push event.
2015-05-09 22:26:52 +02:00
Douwe Maan
Dmitriy Zaporozhets
Robert Speicher
Dmitriy Zaporozhets
