 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
|
87996ece06
|
Whoops.
|
2015-05-12 11:28:35 +02:00 |
|
|
Douwe Maan
|
5615f0397a
|
Tweak text.
|
2015-05-12 10:24:51 +02:00 |
|
|
Douwe Maan
|
3f3237258c
|
Small textual change.
|
2015-05-09 18:20:28 +02:00 |
|
|
Douwe Maan
|
d00eb7e260
|
Tweak presentation and error around historical user count.
|
2015-05-09 18:18:51 +02:00 |
|
|
Dmitriy Zaporozhets
|
c3cf32e863
|
Merge branch 'version-check' into gl-version-check
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
|
2015-05-08 16:05:00 +03:00 |
|
|
Douwe Maan
|
4ffa34a4d6
|
Only show historical active user cound when current doesn't exceed limit.
|
2015-05-07 22:52:52 +02:00 |
|
|
Douwe Maan
|
45ab4d10ef
|
Validate historical active user count when uploading license.
|
2015-05-07 22:38:22 +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 |
|
 Stan Hu
|
a1c6f7ce20
|
Improve help line for restricted domain signups
|
2015-05-05 19:46:37 -07:00 |
|
|
Douwe Maan
|
97bfd764b7
|
Add feature specs for license upload.
|
2015-05-05 14:13:57 +02:00 |
|
|
Douwe Maan
|
f00e1d3dda
|
Add page titles.
|
2015-05-05 13:04:25 +02:00 |
|
|
Douwe Maan
|
2bb2ade50d
|
Merge branch 'master' into license
# Conflicts:
# db/schema.rb
|
2015-05-05 13:03:33 +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 |
|
|
Douwe Maan
|
257f8057a2
|
Minor tweaks.
|
2015-05-03 15:41:40 +02: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 |
|
|
Douwe Maan
|
d1f2b09fad
|
Allow license to be uploaded and enforce its validity.
|
2015-05-01 14:52:30 +02:00 |
|
|
Douwe Maan
|
ae09c2a6db
|
Capitalize "X" in "New X".
|
2015-04-30 21:33:02 +02:00 |
|
|
Douwe Maan
|
26ad250989
|
Add a page title to every page.
|
2015-04-30 19:12:15 +02:00 |
|
|
Dmitriy Zaporozhets
|
93359c7e06
|
Merge branch 'show-aside' of https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-show-aside
|
2015-04-30 19:40:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
5bf9f69df7
|
Fix visibility settings UI in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-04-29 20:32:48 +03:00 |
|
|
Stan Hu
|
808b05e974
|
Move service template and project service settings into a shared view
|
2015-04-29 07:52:27 -07:00 |
|
|
Dmitriy Zaporozhets
|
f21e269668
|
Fix adding new group members from admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-04-27 18:05:51 +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 |
|
 Sullivan SENECHAL
|
f28f5e49f6
|
Fix wrong placement of show-aside link
|
2015-04-27 00:43:02 +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 |
|
|
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 |
|
 Ioannis Kappas
|
3196c52969
|
added fieldset support to project and admin services views.
split field logic to separate template.
|
2015-04-22 20:04:03 +03: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 |
|
|
Douwe Maan
|
87dd3f215f
|
Let members be invited from Add members pane.
|
2015-04-14 12:08:10 +02:00 |
|
|
Douwe Maan
|
2a1d4255da
|
Correctly render invite members without user.
|
2015-04-14 12:07:33 +02:00 |
|
|
Douwe Maan
|
cee98f2247
|
Reference project members by id instead of user_id.
|
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
|
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
|
b9069f31b9
|
Make the New Application form's error messages visible
|
2015-04-07 13:01:30 -04:00 |
|
 Ben Bodenmiller
|
af4577d779
|
remove extra scrollbar on background jobs
|
2015-04-04 05:46:18 -07:00 |
|
 Drew Blessing
|
aaacef47ff
|
Merge branch 'fix-admin-project-urls' into 'master'
Link paths for http and ssh in the admin project show view are incorrect
The link paths for http and ssh in the admin project show view are incorrect. Clicking on them effectively reloads the page. I think the intent is to have the links point to the project dashboard.
Incorrect: http://gitlab.example.com/admin/projects/[namespace]/[project]
Correct: http://gitlab.example.com/[namespace]/[project]
See merge request !214
|
2015-04-03 15:09:30 +00: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 |
|
|
Stan Hu
|
dfd256f29e
|
Support configurable attachment size via Application Settings
Fix bug where error messages from Dropzone would not be displayed on the issues page
Closes #1258
|
2015-04-02 00:04:08 -07:00 |
|
|
Dmitriy Zaporozhets
|
ff23209aec
|
Merge pull request #9029 from tsigo/rs-project-admin
Add archived status to Admin > Project page
|
2015-03-26 08:55:22 -07:00 |
|
 Valery Sizov
|
ca53814389
|
git hook refactoring
|
2015-03-26 13:38:26 +02:00 |
|
|
Valery Sizov
|
ecbd949424
|
pre-defined git-hook form
|
2015-03-26 13:37:29 +02:00 |
|
|
Dmitriy Zaporozhets
|
0b355aba02
|
Replace alerts with well where alert is not needed
|
2015-03-25 23:07:59 -07:00 |
|
|
Robert Speicher
|
c31d40e358
|
Update the "Edit Group" button class on Project Admin page
|
2015-03-25 17:37:05 -04:00 |
|
|
Robert Speicher
|
3008096106
|
Add archived status to Admin > Project page
|
2015-03-25 17:37:05 -04:00 |
|
