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
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
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
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
Valery Sizov
bc9ba5237c
Revert "Added X-GitLab-Event header for web hooks"
...
This reverts commit 548f182814
2015-04-27 16:29:31 +03: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
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
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
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
0ff778c0f4
Link cross-project cross-reference notes to correct project.
2015-04-24 12:30:36 +02:00
Douwe Maan
27af24c1c9
No longer needed to pass project argument to commit methods.
2015-04-24 12:29:36 +02:00
Douwe Maan
8ed7ac9d44
Use project.commit convenience method.
2015-04-24 12:29:36 +02:00
Dmitriy Zaporozhets
97cf775753
Merge branch 'ce-to-ee' into 'master'
...
CE to EE
See merge request !380
2015-04-24 10:29:08 +00:00
Dmitriy Zaporozhets
f502b293e5
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
spec/helpers/gitlab_markdown_helper_spec.rb
2015-04-24 11:22:54 +03:00
Marin Jankovski
f72a81089f
Test existing comment query. Add logging when testing jira service settings.
2015-04-21 20:02:59 +02:00
Robert Speicher
8c9a148720
Update mentionable shared examples to be (a bit) more understandable
2015-04-16 16:30:16 -04:00
Robert Speicher
dee52393b5
Correct usage of subject in specs
2015-04-16 16:30:16 -04:00
Dmitriy Zaporozhets
d01d0c02b7
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
app/controllers/admin/application_settings_controller.rb
app/controllers/groups/group_members_controller.rb
app/controllers/projects/deploy_keys_controller.rb
app/controllers/projects/project_members_controller.rb
app/models/concerns/mentionable.rb
app/models/project.rb
app/models/project_team.rb
app/models/service.rb
app/views/admin/application_settings/_form.html.haml
app/views/admin/groups/show.html.haml
app/views/groups/group_members/_new_group_member.html.haml
config/initializers/1_settings.rb
db/schema.rb
lib/gitlab/reference_extractor.rb
spec/lib/gitlab/reference_extractor_spec.rb
2015-04-15 19:22:57 +03:00
Dmitriy Zaporozhets
089f5b914e
Merge branch 'emailsonpush-hellip' into 'master'
...
Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.
Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2229 .
Since the page is encoded as UTF-8, we don't need HTML entities anymore and can just use the character.
See merge request !521
2015-04-15 12:37:19 +00:00
Douwe Maan
5662b24132
Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.
2015-04-14 16:32:11 +02:00
Douwe Maan
cb5362e7ce
Follow newline guidelines.
2015-04-14 15:16:00 +02:00
Dmitriy Zaporozhets
ef8d96e5de
Merge branch 'ce-to-ee-2' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
LICENSE
app/assets/javascripts/dispatcher.js.coffee
app/controllers/help_controller.rb
app/models/user.rb
app/views/groups/group_members/_new_group_member.html.haml
config/gitlab.yml.example
config/routes.rb
features/groups.feature
features/steps/dashboard/help.rb
2015-04-14 15:08:19 +03:00
Douwe Maan
0013ea5130
Remove duplication between Group and ProjectMember.
2015-04-14 12:41:19 +02:00
Douwe Maan
e50556fcc8
Let invites be declined.
2015-04-14 12:08:11 +02:00
Douwe Maan
629fa7fbe3
Add invite logic to Member.
2015-04-14 12:06:43 +02:00
Dmitriy Zaporozhets
9311f86291
Merge branch 'temp-ce-ee' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
app/assets/javascripts/api.js.coffee
app/assets/javascripts/users_select.js.coffee
2015-04-14 13:05:39 +03:00
Dmitriy Zaporozhets
c420255401
Merge branch 'rs-remove-invalid-key-factories' into 'master'
...
Remove the invalid key factories
They're only used once each, and they're easy to build in-place.
See merge request !1766
2015-04-14 07:33:55 +00:00
Dmitriy Zaporozhets
9c14ed0689
Merge branch 'public-deploy-keys' into 'master'
...
Allow admin to create public deploy keys that are accessible to any project.
Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1774 .
Project settings:
The "Public deploy keys" section is only shown when there are any. If there are public deploy keys but no project deploy keys, only public deploy keys are shown. If there are no public deploy keys and no project deploy keys, the current "Deploy keys from projects you have access to will be displayed here" placeholder is shown.
The list of projects below the public key has been changed to only show projects the user has access to.
"Public deploy key" seems to be repeated on the left, but the first is just the title. The label is always visible for public deploy keys.
Admin index:
Admin detail page:
Projects using the deploy key are listed on the left and can be disabled easily.
See merge request !469
2015-04-13 09:08:13 +00:00
Robert Speicher
273df6a44b
Remove the invalid key factories
...
They're only used once each, and they're easy to build in-place.
2015-04-11 17:12:10 -04:00
Robert Speicher
307962a046
Rename last uses of Buildbox to Buildkite
2015-04-11 14:05:22 -04:00
Robert Speicher
93b1767799
Move buildbox_service files to buildkite_service
2015-04-11 14:05:22 -04:00
Valery Sizov
bafec400f1
CI forking: tests
2015-04-06 19:45:16 +03:00
Douwe Maan
edc4a56d26
Allow admin to create public deploy keys that are accessible to any project.
2015-04-03 12:23:20 +02:00
Douwe Maan
Dmitriy Zaporozhets
Valery Sizov
Stan Hu
Robert Speicher
Dominik Sander
bugagazavr
Dmitriy Zaporozhets
Marin Jankovski
