Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

GraceDB Server
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

7b7b69f4

Commit 7b7b69f4 authored 12 years ago by Brian Moe

Downloads
- Plain Diff

Merge branch 'stage' into update

Conflicts:
	settings/default.py

parents 3dd2b872 93f7677e

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

gracedb/alert.py 2 additions, 2 deletions

gracedb/alert.py
gracedb/api.py 2 additions, 2 deletions

gracedb/api.py
gracedb/middleware/auth.py 34 additions, 30 deletions

gracedb/middleware/auth.py
gracedb/translator.py 5 additions, 5 deletions

gracedb/translator.py
gracedb/views.py 5 additions, 6 deletions

gracedb/views.py
settings/__init__.py 2 additions, 0 deletions

settings/__init__.py
settings/default.py 10 additions, 2 deletions

settings/default.py
settings/production.py 2 additions, 0 deletions

settings/production.py
settings/stage.py 15 additions, 0 deletions

settings/stage.py
templates/gracedb/event_list.html 1 addition, 1 deletion

templates/gracedb/event_list.html
urls.py 4 additions, 0 deletions

urls.py

with 82 additions and 48 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment