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
77dc71d550
Fix mentioning of private groups.
2015-05-14 13:15:13 +02: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
Hannes Rosenögger
1dd0caf4d9
Merge branch 'fix-avatar-removal' into 'master'
...
Fix bug where avatar filenames were not actually deleted from the database during removal
This would result in a 404 error in certain views.
The `save` call was being rolled back due to an error in the validation step.
Relax the validation step so that this works.
Closes #1570
See merge request !620
2015-05-12 14:46:58 +00:00
Dmitriy Zaporozhets
1a1e42ad31
Merge branch 'rs-system-note' into 'master'
...
Add SystemNoteService class
The Note model was basically two models crammed together - one handling user-created notes
(i.e., comments on things) and one handling system-created notes (i.e., references).
This splits out the system-specific stuff to a new SystemNoteService class.
See merge request !595
2015-05-12 10:45:42 +00: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
5615f0397a
Tweak text.
2015-05-12 10:24:51 +02:00
Robert Speicher
b94c6d9f5b
Check if system is truthy in Note.cross_reference?
2015-05-11 00:01:16 -04:00
Robert Speicher
48e6fb532a
Add a SystemNoteService class
...
There's a lot of code in the Note model that only deals with creating
system notes, so we're going to split that into its own class.
2015-05-11 00:01:01 -04:00
Robert Speicher
0e89ff0fb0
Simplify Note#upvote? and Note#downvote?
2015-05-10 23:56:15 -04:00
Robert Speicher
19b897e998
Remove extra devise call that got added by accident
2015-05-10 19:13:47 -04:00
Marin Jankovski
6fdc51f81d
Merge branch 'bug/fix-duplicate-deploy-keys' into 'master'
...
Don't show duplicate deploy keys
This fixes the issue described in [#1516 ](https://gitlab.com/gitlab-org/gitlab-ce/issues/1516 ) where you would see the same deploy key multiple times if it was used by multiple projects.
See merge request !629
2015-05-10 07:21:39 +00:00
Robert Speicher
11989d62d0
Remove unnecessary User#login accessor override
2015-05-09 17:39:16 -04:00
Robert Speicher
c845347b23
Generate 10 2FA backup codes instead of the default of 5
2015-05-09 17:32:48 -04:00
Robert Speicher
b050bb5bad
Fix 2FA backup code removal
2015-05-09 17:32:48 -04:00
Robert Speicher
661d09a22b
Re-annotate User model
2015-05-09 17:32:24 -04:00
Robert Speicher
66bc758e2b
Update User model for two-factor auth
2015-05-09 17:32:05 -04:00
Dmitriy Zaporozhets and Robert Speicher
50a2a229e7
Fix rubocop complain
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
d00eb7e260
Tweak presentation and error around historical user count.
2015-05-09 18:18:51 +02:00
Maran
a0fd2eb568
Don't show duplicate deploy keys. Fixes #1516
2015-05-08 21:32:03 +02:00
Valeriy Sizov
f682a6adb9
Merge pull request #9214 from Bugagazavr/hook-events
...
Added X-GitLab-Event header for web hooks
2015-05-08 17:17:01 +03:00
bugagazavr
acac788902
Added X-GitLab-Event header for web hooks
2015-05-08 16:49:03 +03:00
Douwe Maan
45ab4d10ef
Validate historical active user count when uploading license.
2015-05-07 22:38:22 +02:00
Douwe Maan
85c04a8aa6
Track historical active user count.
2015-05-07 22:38:17 +02:00
Douwe Maan
fbb011be38
Merge branch 'license' into 'master'
...
Allow license to be uploaded and enforce its validity.
Addresses #274 .
Still a work in progress, there are no tests yet, some things need extra validation or prettier error messages, and we're not doing anything to enforce active user count yet. Still, the flow stands! Let me know what you think :)
- [x] Check active user count at moment of upload
- [x] Prettier validation / error message when license is invalid
- [x] Prettier error when public key is invalid
- [x] Tests
- [x] Work on copy
These will go into separate MRs as they require more discussion:
- Check historic active user count over past year
- Add application setting to disallow creating/activating new user when limit is reached
-----
No license:
Also shown when pushing code:
The "Upload a new license in the admin area" part is only for admins, regular users will see "Ask an admin to upload a new license".
Upload page in admin area:
License details in admin area:
Notice of a license that will expire: Also notice the license history at the bottom.
Notice of an expired license:
cc @dzaporozhets @sytse
See merge request !383
2015-05-07 18:54:47 +00:00
Stan Hu
bf4b438459
Fix bug where avatar filenames were not actually deleted from the database during removal.
...
This would result in a 404 error in certain views.
The `save` call was being rolled back due to an error in the validation step.
Relax the validation step so that this works.
Closes #1570
2015-05-07 10:00:35 -07:00
Robert Speicher
1108915f75
Change wording for task list summaries
2015-05-06 17:27:10 -04:00
Robert Speicher
e167f28549
Update Taskable to use TaskList
2015-05-06 12:58:28 -04:00
Dmitriy Zaporozhets
23b4cc060f
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
db/schema.rb
2015-05-06 14:28:11 +03:00
Douwe Maan
97bfd764b7
Add feature specs for license upload.
2015-05-05 14:13:57 +02:00
Douwe Maan
2bb2ade50d
Merge branch 'master' into license
...
# Conflicts:
# db/schema.rb
2015-05-05 13:03:33 +02:00
Valery Sizov
2144cc710a
fix gitlab CI links
2015-05-05 14:02:31 +03:00
Douwe Maan
caa09e6951
Add License unit test.
2015-05-05 13:02:17 +02:00
Douwe Maan
60323c6143
Validate that new license hasn't expired already.
2015-05-05 12:19:33 +02:00
Douwe Maan
6d093d84b1
Show prettier error message when license file is invalid.
2015-05-05 11:49:28 +02:00
Douwe Maan
10e6aa62b9
Validate number of active users at time of upload.
2015-05-05 10:53:51 +02:00
Douwe Maan
bff1b8f8e7
More code cleanup.
2015-05-05 10:40:38 +02:00
Douwe Maan
68ac20604b
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee
...
# Conflicts:
# app/controllers/groups/application_controller.rb
# app/services/test_hook_service.rb
# app/views/admin/groups/show.html.haml
# app/views/groups/_settings_nav.html.haml
# app/views/groups/show.html.haml
# app/views/layouts/_head.html.haml
# app/views/projects/_settings_nav.html.haml
# db/schema.rb
# features/project/project.feature
# features/steps/project/project.rb
2015-05-05 10:18:27 +02:00
Stan Hu
a3157626f1
Re-annotate models
2015-05-03 13:38:27 -07:00
Douwe Maan
257f8057a2
Minor tweaks.
2015-05-03 15:41:40 +02:00
Dmitriy Zaporozhets
4291e28af7
Merge branch 'change-primary-email' into 'master'
...
Allow primary email to be set to an email that you've already added.
Fixes gitlab-com/support-forum#106.
When the user sets their primary email to an email that they've already added to their account, this patch makes sure that secondary email record is destroyed, and a new email record is created for the old primary email. This is based on the assumption that in this case no email was meant to be deleted, but the user simply wanted to change which of their emails is primary.
See merge request !591
2015-05-03 11:00:51 +00:00
Stan Hu
eb4f1eb5f5
Add application setting to restrict user signups to e-mail domains
...
This feature was requested long ago:
http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains
This MR is based off !253 but changed to use application settings and use wildcard strings
to give more flexibility in pattern matching. Regexps seemed overkill and easy to get wrong.
Only restrict e-mail addresses upon creation
2015-05-02 09:36:52 -07:00
Robert Speicher
99fcf2e6fe
Improve/add specs for Project#get_issue and #issue_exists?
2015-05-01 13:29:36 -04:00
Douwe Maan
d1f2b09fad
Allow license to be uploaded and enforce its validity.
2015-05-01 14:52:30 +02:00
Robert Speicher
66a3c4280d
Change external_issue_tracker.blank? to !external_issue_tracker
2015-04-30 17:27:51 -04:00
Douwe Maan
Dmitriy Zaporozhets
Hannes Rosenögger
Robert Speicher
Marin Jankovski
Maran
Valeriy Sizov
bugagazavr
Stan Hu
