diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-16 01:16:52 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@parabola.nu> | 2019-03-10 01:08:39 -0500 |
commit | 613bc6c4bffaddb127103e61620dcef20fcd0eef (patch) | |
tree | adbcc423f5957cfa37d933aa940f1253098b0e69 | |
parent | 2d41298fbb89a87ce7628793c9a94665fe5e8a35 (diff) |
Merge branch 'archweb-generic'
-rw-r--r-- | devel/fixtures/staff_groups.json | 32 | ||||
-rw-r--r-- | main/fixtures/groups.json | 2 |
2 files changed, 10 insertions, 24 deletions
diff --git a/devel/fixtures/staff_groups.json b/devel/fixtures/staff_groups.json index 6a0a0514..6b245622 100644 --- a/devel/fixtures/staff_groups.json +++ b/devel/fixtures/staff_groups.json @@ -2,13 +2,13 @@ { "fields": { "group": [ - "Developers" + "Hackers" ], - "description": "This is a list of the current Arch Linux Developers. They maintain the [core] and [extra] package repositories in addition to doing any other developer duties.", + "description": "This is a list of the current Parabola Hackers. They maintain the [libre] package repository and keep the [core], [extra], and [community] repositories clean of nonfree software, in addition to doing any other developer duties.", "sort_order": 1, - "member_title": "Developer", - "slug": "developers", - "name": "Developers" + "member_title": "Hacker", + "slug": "hackers", + "name": "Hackers" }, "model": "devel.staffgroup", "pk": 1 @@ -16,27 +16,13 @@ { "fields": { "group": [ - "Trusted Users" + "Retired Hackers" ], - "description": "Here are all your friendly Arch Linux Trusted Users who are in charge of the [community] repository.", - "sort_order": 2, - "member_title": "Trusted User", - "slug": "trusted-users", - "name": "Trusted Users" - }, - "model": "devel.staffgroup", - "pk": 2 -}, -{ - "fields": { - "group": [ - "Retired Developers" - ], - "description": "Below you can find a list of ex-developers (aka project fellows). These folks helped make Arch what it is today. Thanks!", + "description": "Below you can find a list of ex-hackers (aka project fellows). These folks helped make Parabola what it is today. Thanks!", "sort_order": 11, "member_title": "Fellow", - "slug": "developer-fellows", - "name": "Developer Fellows" + "slug": "hacker-fellows", + "name": "Hacker Fellows" }, "model": "devel.staffgroup", "pk": 3 diff --git a/main/fixtures/groups.json b/main/fixtures/groups.json index 2f52c9d1..e1ef0556 100644 --- a/main/fixtures/groups.json +++ b/main/fixtures/groups.json @@ -479,7 +479,7 @@ }, { "fields": { - "name": "Retired Developers", + "name": "Retired Hackers", "permissions": [] }, "model": "auth.group", |