diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-12-04 23:07:59 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-12-04 23:07:59 -0300 |
| commit | 988c2c6d400b3721464c2891891807d504b076b0 (patch) | |
| tree | 013dc3d676edad701d0d3bbd239bc2df0cdf76b4 /main/fixtures | |
| parent | 60a1fc6cc4cef0b9eed58ea4f0ca003b76ec382a (diff) | |
| parent | 183c4d9cefa95f46c3fa3a6936f837542426eac2 (diff) | |
Merge branch 'master' of ssh://gparabola/parabolaweb
Conflicts:
local_settings.py.example
media/archweb.css
packages/templatetags/package_extras.py
public/views.py
templates/packages/details.html
templates/packages/flag.html
templates/packages/flag_confirmed.html
templates/packages/flagged.html
templates/packages/search.html
templates/public/download.html
templates/todolists/view.html
Diffstat (limited to 'main/fixtures')
| -rw-r--r-- | main/fixtures/arches.json | 8 | ||||
| -rw-r--r-- | main/fixtures/groups.json | 22 |
2 files changed, 9 insertions, 21 deletions
diff --git a/main/fixtures/arches.json b/main/fixtures/arches.json index 6334c2d3..1e9dbc91 100644 --- a/main/fixtures/arches.json +++ b/main/fixtures/arches.json @@ -22,5 +22,13 @@ "agnostic": false, "name": "x86_64" } + }, + { + "pk": 4, + "model": "main.arch", + "fields": { + "agnostic": false, + "name": "mips64el" + } } ] diff --git a/main/fixtures/groups.json b/main/fixtures/groups.json index 8a6b2287..aa826b83 100644 --- a/main/fixtures/groups.json +++ b/main/fixtures/groups.json @@ -11,11 +11,6 @@ "package" ], [ - "add_signoff", - "main", - "signoff" - ], - [ "add_todolist", "main", "todolist" @@ -39,16 +34,6 @@ "delete_todolistpkg", "main", "todolistpkg" - ], - [ - "add_news", - "news", - "news" - ], - [ - "change_news", - "news", - "news" ] ] } @@ -342,11 +327,6 @@ "package" ], [ - "add_signoff", - "main", - "signoff" - ], - [ "add_todolist", "main", "todolist" @@ -403,4 +383,4 @@ ] } } -]
\ No newline at end of file +] |