Commit Graph

3463 Commits

Author SHA1 Message Date
Carol Willing
a20f5e44d1 Merge pull request #1819 from minrk/test-tornado-45
require tornado 5
2018-05-02 20:12:59 +02:00
Min RK
cd746d72d4 scrub redirect urls as well 2018-05-02 12:58:50 +02:00
Min RK
f7eaff0828 ensure changed is defined
avoids UnboundLocal error when no change has occurred
2018-05-02 12:52:58 +02:00
Min RK
849f119a47 Merge pull request #1835 from minrk/secret-logs
further scrub potentially sensitive url params
2018-05-02 11:58:40 +02:00
Min RK
52b68381f6 require tornado 5 2018-05-02 11:56:26 +02:00
Min RK
46d495e1e2 use btn-primary instead of btn-success
avoid references to formerly-green color
2018-05-02 11:19:46 +02:00
Min RK
acc6c22355 eliminate distinction between 'primary' and 'success'
since we don't use them both on the same screen
2018-05-02 11:16:56 +02:00
Min RK
8143182971 pick colorblind-friendly alternatives for success/danger
danger is still red, success is now blue

picked from color brewer 2 RdYlBu
2018-05-02 11:14:19 +02:00
Carol Willing
04a22cd482 Merge pull request #1841 from rkdarst/run_same_service_culling
cull_idle_servers: Add note about running with different timeouts
2018-05-02 05:41:13 +02:00
Richard Darst
4376224084 cull_idle_servers: Add note about running with different timeouts
- Instead of creating many options for different timeouts of users and
  servers, just add a note that the whole culler can be run multiple
  times with different options.  See discussion in #1834.
- Closes: #1834
2018-05-02 01:11:29 +03:00
Min RK
a9fe88c343 Merge pull request #1838 from tklever/moment-upgrade
chore: bump moment.js version
2018-04-30 14:59:43 +02:00
Carol Willing
6eb95e1c66 Merge pull request #1839 from jupyterhub/spawner-as-noun
Use verb spawn in README to refer to things related to spawner
2018-04-30 14:36:27 +02:00
J Forde
a46287c4a6 Update README.md
We should probably use the verb spawn to refer to the spawner since the spawner is the name of a specific part of JHub
2018-04-30 13:27:25 +02:00
Haw-minn Lu
bc86ee1c31 Add custom handlers and allow setting of defaults 2018-04-27 15:58:59 -07:00
Haw-minn Lu
a73e6f0bf8 Attach an info field to the service 2018-04-27 14:51:55 -07:00
Tim Klever
10a6c5144d chore: bump moment.js version
Moving to 2.19.3 or higher to clear some regex issues
2018-04-27 09:53:51 -07:00
Carol Willing
4e5f43aeae Merge pull request #1832 from minrk/dockerfiles
Docker updates
2018-04-27 06:10:59 -07:00
Min RK
ff56db0c8b Merge pull request #1828 from rkdarst/authenthicator_blacklist
Authenthicator blacklist
2018-04-26 17:59:44 +02:00
Richard Darst
95a9b97649 Add tests for authentication blacklist 2018-04-26 17:51:25 +03:00
Min RK
a5b5208823 add build context to alpine dir 2018-04-26 16:43:56 +02:00
Min RK
783295fabd fix tags in post_push 2018-04-26 16:43:56 +02:00
Min RK
1c942ec97c ubuntu base image has utf8 locale 2018-04-26 16:43:56 +02:00
Min RK
3b6d2655ab fix onbuild build arg 2018-04-26 16:43:56 +02:00
Min RK
8a18d0daab move onbuild hook to post_build 2018-04-26 16:43:56 +02:00
Min RK
e9f7ccbd25 make build hooks exit on failure 2018-04-26 16:43:56 +02:00
Min RK
68d9f35c0b build all our docker images on circleci 2018-04-26 16:43:56 +02:00
Min RK
28d78134c1 remove push from circle
building directly on docker cloud now, no credentials needed
2018-04-26 16:43:56 +02:00
Min RK
fd92ac852d add docker cloud hooks for onbuild 2018-04-26 16:43:56 +02:00
Min RK
8399f5288e add BASE_IMAGE build arg for onbuild
for easier automated building
2018-04-26 16:43:56 +02:00
Min RK
f99b7cb7eb update Python, conda, ubuntu in Dockerfile 2018-04-26 16:43:56 +02:00
Min RK
bb5166077f further scrub potentially sensitive url params
include oauth codes, state, and tokens
2018-04-26 16:42:24 +02:00
Carol Willing
b72e4b66ca Merge pull request #1831 from minrk/service-stop
service.stop is a coroutine
2018-04-26 07:28:55 -07:00
Carol Willing
ed85cd25d6 Merge pull request #1827 from minrk/circle
simplify circle2 config
2018-04-26 07:23:52 -07:00
Carol Willing
3f90697e18 Merge pull request #1820 from minrk/test-db-upgrade
test database upgrades
2018-04-26 07:22:58 -07:00
Tim Head
73271a3e55 Merge pull request #1833 from rkdarst/cull_idle_py36
Note cull-idle needs python3
2018-04-26 15:44:35 +02:00
Richard Darst
6f9ea712de Note cull-idle needs python3
- Closes: #1825
2018-04-26 16:30:51 +03:00
Min RK
6ee244e7cb Merge pull request #1829 from rkdarst/cull_idle_py36
cull_idle_servers.py: py<3.6 compatibility
2018-04-26 14:42:24 +02:00
Min RK
d66a4af79b service.stop is a coroutine
fixes waiting for services to stop on shutdown
2018-04-26 14:29:50 +02:00
Richard Darst
ea7b1caa4e Add blacklist to auth.py
- Introduce blacklist to supplement white list
- Original code by github:ndiy, updated by github:rkdarst
2018-04-26 15:22:41 +03:00
Richard Darst
9cd880fb35 cull_idle_servers.py: Remove f-string for py3.4 compatibility 2018-04-26 15:05:49 +03:00
Min RK
658c152707 simplify circleci 2 config 2018-04-26 10:49:22 +02:00
Min RK
6f1ba77608 Merge pull request #1813 from rkdarst/api_server_state
add server.state to server model if requester is an admin
2018-04-26 10:33:22 +02:00
Richard Darst
2344d696ca API: pass 'server_state' through to admin clients only
- This will allow, for example, cull_idle_servers to be more
  intelligent when culling servers.
- This is only given to admin API users, because we don't know if all
  spawners expect their state to be made available to users.
2018-04-24 16:52:18 +03:00
Min RK
bd816310cb Merge pull request #1817 from minrk/server-model
Always include server sub-models in user api requests
2018-04-24 14:12:58 +02:00
Min RK
2bcf759a9f Don't forget to install db libs in upgrade env 2018-04-24 11:44:08 +02:00
Min RK
82a04f7032 Merge pull request #1823 from willingc/test-time
Add a pytest ini file for running marked tests and edit testing mock files
2018-04-24 11:38:57 +02:00
Min RK
4281babee4 make server-model inclusion opt-in
so only certain API endpoints include server info:

- user list
- get named user

The rest exclude running servers
2018-04-24 11:35:51 +02:00
Min RK
d89f2965cf handle updated server models in culler
- servers sub-models model always defined in 0.9
- explicit 'ready' key added, use user.url fallback only when needed
2018-04-24 11:35:15 +02:00
Min RK
e2a2a9903a spawner.pending is None when nothing is pending
rather than False, which is a bit less convenient since we turn it to None in APIs anyway
2018-04-24 11:35:15 +02:00
Min RK
4401cdc16a Always have .servers model on users
rather than only when named_servers is enabled.

Put new-in-0.9 state there, rather than continuing to add server fields to top-level user model.
2018-04-24 11:35:15 +02:00