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
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
Robert Speicher
84a7675ea6
Remove title_for_issue helper
2015-04-30 17:27:33 -04:00
Robert Speicher
0027c2ddd7
Add Project#get_issue
2015-04-30 16:35:27 -04:00
Douwe Maan
d386bb7808
Allow primary email to be set to an email that you've already added.
2015-04-30 16:17:03 +02:00
Douwe Maan
7e0eb486ed
Don't allow a merge request to be merged when its title starts with "WIP".
2015-04-30 15:46:36 +02:00
Robert Speicher
5ada96db54
Fix Note model spec
2015-04-28 16:01:34 -04:00
Dmitriy Zaporozhets
8140c68289
Merge branch 'rs-issue-2269' into 'master'
...
Remove duplicate settings for default_url_options
Closes #2269
See merge request !1797
2015-04-28 08:34:34 +00:00
Dmitriy Zaporozhets
c1a5f4710a
Merge pull request #8645 from chulkilee/hipchat-api-version
...
Add api version property on hipchat service
2015-04-27 17:07:54 +03:00
Valery Sizov
bc9ba5237c
Revert "Added X-GitLab-Event header for web hooks"
...
This reverts commit 548f182814
2015-04-27 16:29:31 +03:00
Chulki Lee
57c724558d
Add api version property on hipchat service
2015-04-27 21:14:04 +09:00
Dmitriy Zaporozhets
2e243fc321
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
README.md
VERSION
app/controllers/projects/services_controller.rb
app/controllers/projects/uploads_controller.rb
app/services/test_hook_service.rb
db/schema.rb
features/steps/admin/settings.rb
lib/gitlab/reference_extractor.rb
spec/models/note_spec.rb
2015-04-27 11:53:31 +03:00
Dmitriy Zaporozhets
278c3ba401
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-04-27 11:38:36 +03:00
Dmitriy Zaporozhets
2cbdfbfd1e
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-04-27 11:38:29 +03:00
Dmitriy Zaporozhets
38e2ae5ae0
Merge pull request #8644 from Bugagazavr/hook-events
...
Add X-GitLab-Event header for web hooks
2015-04-27 11:22:33 +03:00
Dmitriy Zaporozhets
57759c9aee
Merge branch 'forked-event' into 'master'
...
Use Projects::CreateService to fork projects so that after-create hooks are run.
Makes for cleaner code and less duplication, and causes the "User created project Namespace / Project" event to be posted and system hooks to be run.
See merge request !575
2015-04-27 07:41:20 +00:00
Dominik Sander
3c3b43b0a0
Add notify and color options to HipchatService
...
When notify is set to true send messages will trigger a notification for
all room members.
Color changes the background color of the message.
2015-04-26 22:00:51 +02:00
Vinnie Okada
bd557e4b64
Add new admin settings
...
Add new global application settings for default project and snippet
visibility levels.
2015-04-26 07:48:19 -06:00
Robert Speicher
aa9435cddb
Remove duplicate settings for default_url_options
...
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2269
2015-04-25 19:46:04 -04:00
Robert Speicher
682ec038ac
Rename CommitRange#sha_from_as_param to #suffixed_sha_from
2015-04-25 14:59:47 -04:00
Robert Speicher
165cacce16
Rename CommitRange#inclusive? to #exclude_start?
2015-04-25 14:58:49 -04:00
Robert Speicher
92c681a53c
Remove CommitRange#to_a
2015-04-25 14:45:56 -04:00
Robert Speicher
2403a28b3f
Include caret in CommitRange#reference_title
2015-04-25 14:41:06 -04:00
Robert Speicher
c11d3c5789
Remove param from CommitRange#to_s
2015-04-25 14:41:06 -04:00
Robert Speicher
81a21e5796
CommitRange improvements
2015-04-25 14:41:06 -04:00
Robert Speicher
a8e6656481
Add CommitRange class
2015-04-25 14:40:40 -04:00
bugagazavr
548f182814
Added X-GitLab-Event header for web hooks
2015-04-25 21:31:52 +03:00
Douwe Maan
0cf76a0b70
Use Projects::CreateService to fork projects so that after-create hooks are run.
2015-04-24 22:58:27 +02:00
Douwe Maan
5f839770e7
Revert "Rename namespace_regex to namespace_path_regex."
...
This reverts commit c0116926c7
2015-04-24 15:16:38 +02:00
Douwe Maan
70f9893ed6
Explain namespace clearn regex.
2015-04-24 14:49:23 +02:00
Douwe Maan
fac1f83fd5
Properly migrate users with usernames like "." or "..".
2015-04-24 14:49:23 +02:00
Douwe Maan
c0116926c7
Rename namespace_regex to namespace_path_regex.
2015-04-24 14:49:22 +02:00
Douwe Maan
Dmitriy Zaporozhets
Valery Sizov
Stan Hu
Robert Speicher
Dmitriy Zaporozhets
Chulki Lee
Dominik Sander
Vinnie Okada
bugagazavr
