Commit Graph

4584 Commits

Author SHA1 Message Date
Erik Sundell
cebb1f3e22 Merge pull request #3314 from timgates42/bugfix_typo_function
docs: fix simple typo, funciton -> function
2020-12-23 10:24:50 +01:00
Tim Gates
1e53fd1f8c docs: fix simple typo, funciton -> function
There is a small typo in jupyterhub/orm.py.

Should read `function` rather than `funciton`.
2020-12-23 11:54:51 +11:00
0mar
6ad757f7e7 Merge remote-tracking branch 'upstream/rbac' into merge_api_with_orm 2020-12-17 09:22:44 +01:00
Min RK
8c5cd005fa Merge pull request #3308 from IvanaH8/rbac-service-roles-fix
fixed default roles for mocked services
2020-12-17 08:44:23 +01:00
0mar
f10fc0f0c0 No more need for mock roles 2020-12-16 14:46:08 +01:00
IvanaH8
8a7320b318 fixed default roles for mocked services 2020-12-16 11:17:43 +01:00
0mar
3eccf7abdd Changed scopes from list to set and made filters additive 2020-12-14 17:39:06 +01:00
Erik Sundell
166b00867f Merge pull request #3305 from minrk/github-release
publish releases from github actions
2020-12-11 16:39:42 +01:00
Min RK
7c474396f1 publish releases from github actions 2020-12-11 12:27:34 +01:00
Min RK
f6f6b3afa3 back to dev 2020-12-11 12:08:22 +01:00
Min RK
a91197635a release 1.3.0 1.3.0 2020-12-11 12:07:55 +01:00
Min RK
88706d4c27 final changelog edits for 1.3.0 2020-12-11 12:07:06 +01:00
Min RK
29fac11bfe Merge pull request #3295 from minrk/changelog-1.3
begin changelog for 1.3
2020-12-11 12:02:15 +01:00
Erik Sundell
947ef67184 Merge pull request #3303 from Sangarshanan/patch-1
Remove the extra parenthesis in service.md
2020-12-11 09:39:28 +01:00
sangarshanan
8ede924956 Remove extra paranthesis 2020-12-11 13:15:13 +05:30
sangarshanan
55c2d3648e Add the missing parenthesis in service.md 2020-12-11 01:53:35 +05:30
0mar
62c56ec2c8 Started work on fixing tests 2020-12-09 17:34:49 +01:00
0mar
16657e0c88 Integrated scopes with roles 2020-12-09 17:34:33 +01:00
0mar
e47d96e016 Merge remote-tracking branch 'upstream/rbac' into merge_api_with_orm 2020-12-09 15:24:48 +01:00
Min RK
4cc2f0a363 Merge pull request #3215 from IvanaH8/implementing-default-roles
[RBAC] Implementing roles as collections of permission scopes
2020-12-09 15:02:01 +01:00
IvanaH8
9de9070641 fixed scope test attr error for older_requirements.txt test 2020-12-09 14:50:50 +01:00
Min RK
2cf8e48fb5 start changelog for 1.3
I noticed that our jinja async feature is new in 2.9, and matured in 2.11, so explicitly require that
2020-12-09 14:31:10 +01:00
Min RK
ae77038a64 Merge pull request #3293 from minrk/services-whoami
allow services to call /api/user to identify themselves
2020-12-09 13:25:46 +01:00
0mar
4ab2e3aa0a Fixed merge request after cherrypick 2020-12-09 12:25:33 +01:00
Min RK
ffed8f67a0 Merge pull request #3294 from minrk/paginate-per-page
fix increasing pagination limits
2020-12-08 10:03:51 +01:00
Ivana
f9a3eec147 Merge branch 'rbac' into implementing-default-roles 2020-12-08 08:41:04 +01:00
IvanaH8
c514259f1a addressed review comments from Omar 2020-12-08 08:28:23 +01:00
Erik Sundell
1efd7da6ee Merge pull request #3300 from mxjeff/fixed-doc-services
Fixed idle-culler references.
2020-12-04 11:46:04 +01:00
Geoffroy Youri Berret
6e161d0140 Fixed idle-culler references.
Merge request #3257 fixed #3256 only on getting-started/services-basics.md
There is still a reference to jupyterhub example cull-idle in reference/services.md
2020-12-04 09:28:02 +01:00
IvanaH8
ab297a7747 added scope expansion unit testing 2020-12-03 14:53:53 +01:00
Min RK
5f4144cc98 Merge pull request #3298 from coffeebenzene/master
Fix asyncio deprecation asyncio.Task.all_tasks
2020-12-03 11:16:46 +01:00
coffeebenzene
f866bbcf45 Use variable instead of monkey patching asyncio 2020-12-02 19:50:49 +00:00
coffeebenzene
ed6231d3aa Fix asyncio deprecation asyncio.Task.all_tasks 2020-12-02 17:57:28 +00:00
Min RK
9d38259ad7 fix increasing pagination limits
setting per_page in constructor resolves before max_per_page limit is updated from config,
preventing max_per_page from being increased beyond the default limit

we already loaded these values anyway in the first instance,
so remove the redundant Pagination object
2020-12-02 12:52:42 +01:00
Min RK
4b254fe5ed Merge pull request #3243 from agp8x/master
[Metrics] Add prefix to prometheus metrics to group all jupyterhub metrics
2020-12-02 12:22:32 +01:00
Min RK
f8040209b0 allow services to call /api/user to identify themselves 2020-12-02 12:21:25 +01:00
Min RK
e59ee33a6e note versionchanged in metrics module docstring 2020-12-02 11:36:13 +01:00
Min RK
ff15ced3ce Merge pull request #3225 from cbanek/configurable_options_from_form
Allow options_from_form to be configurable
2020-12-02 11:32:24 +01:00
Min RK
75acd6a67b Merge pull request #3264 from tlvu/add-user-agreement-to-login-screen
Add optional user agreement to login screen
2020-12-02 11:31:23 +01:00
Min RK
73ac6207af Merge pull request #3244 from mhwasil/fix-https-redirect-issues
[Docs] Fix https reverse proxy redirect issues
2020-12-02 11:30:09 +01:00
Min RK
6fc3dc4c01 Merge master into rbac 2020-12-02 11:28:53 +01:00
Min RK
e435fe66a5 Merge pull request #3292 from minrk/oldest-metrics
bump oldest-required prometheus-client
2020-12-02 11:27:27 +01:00
Min RK
5540859460 Merge pull request #3212 from 0mar/implement_scopes
Implementing RBAC scope checking in API handlers
2020-12-02 11:23:24 +01:00
Min RK
d7569d6f8e bump oldest-required prometheus-client
oldest-dependency tests caught an error with our base required version
2020-12-02 11:20:30 +01:00
Min RK
ba6c2cf854 Merge pull request #3266 from 0mar/reduce_ssl_testing
Test internal_ssl separately
2020-12-02 10:59:39 +01:00
0mar
970b25d017 Added docstrings 2020-12-01 10:49:10 +01:00
0mar
671ef0d5ef Moved ssl options to proxy 2020-12-01 10:30:44 +01:00
IvanaH8
de04ae1471 verifying api requested token roles permissions against the token owner permissions 2020-12-01 08:44:29 +01:00
Omar Richardson
73020a70f2 Mocked request.path 2020-11-30 23:16:00 +01:00
Erik Sundell
77220d6662 Merge pull request #3289 from minrk/user-count
fix and test TOTAL_USERS count
2020-11-30 15:21:48 +01:00