config

Merge lp://staging/~knome/config/planet-ubuntu into lp://staging/~planet-ubuntu/config/main

  1. planet-ubuntu
  2. Merge into main
Proposed by Pasi Lallinaho
Status: Merged
Merged at revision: 1764
Proposed branch: lp://staging/~knome/config/planet-ubuntu
Merge into: lp://staging/~planet-ubuntu/config/main
Diff against target: 2088 lines (+472/-695)
2 files modified
config.ini (+243/-695)
config_old.ini (+229/-0)
To merge this branch: bzr merge lp://staging/~knome/config/planet-ubuntu
Reviewer Review Type Date Requested Status
Elfy (community) Needs Fixing
Scott Ritchie Pending
Daniel Holbach Pending
Review via email: mp+247443@code.staging.launchpad.net

This proposal supersedes a proposal from 2015-01-23.

Description of the change

* Create config_old.ini to hold (temporarily) removed feeds from:
  - People who aren't Ubuntu members
  - People who want their feed to be disabled for their hiatus
  - Sites that do not have content, or return a HTTP error
* Drop sites that clearly do not exist any more in any level
* Add sponsors to some team blogs
* Move some teams blogs to the team blogs listing
* Fix all nicks to point to existing Launchpad usernames
* Fix some feed URLs
* Improve the instructions

Updated on January 23, 2015 after (manually) rebasing against the current config.

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote : Posted in a previous version of this proposal

Reviewed until line 385 of the diff. Can anyone else have a look as well?

review: Needs Fixing
Revision history for this message
Scott Ritchie (scottritchie) wrote : Posted in a previous version of this proposal

akgraner is being demoted by this diff, under the heading "not an ubuntu member", but she is. https://launchpad.net/~akgraner

review: Needs Fixing
Revision history for this message
Pasi Lallinaho (knome) wrote : Posted in a previous version of this proposal

As I noted in the mail, the Launchpad API is not perfect, so manual reviewing is still needed.

Is there anything else to be changed? Did you review the rest of the file already?

I'll resubmit the proposal with that change if nothing appears in a few days.

Revision history for this message
Daniel Holbach (dholbach) wrote : Posted in a previous version of this proposal

Pasi: do you think you could re-run the script the current config? O:-)

Revision history for this message
Daniel Holbach (dholbach) wrote : Posted in a previous version of this proposal

Text conflict in config.ini
Conflict adding file heads/amjjawad.png. Moved existing file to heads/amjjawad.png.moved.
Conflict adding file heads/carla-sella.png. Moved existing file to heads/carla-sella.png.moved.
Conflict adding file heads/mbruzek.png. Moved existing file to heads/mbruzek.png.moved.
Conflict adding file heads/paulw2u.png. Moved existing file to heads/paulw2u.png.moved.
Path conflict: heads/rpadovani.png / <deleted>
Conflict adding file heads/sgclark.png. Moved existing file to heads/sgclark.png.moved.
Conflict adding file heads/snwh.png. Moved existing file to heads/snwh.png.moved.
Conflict adding file heads/teward.png. Moved existing file to heads/teward.png.moved.
Conflict adding file heads/uflogo.png. Moved existing file to heads/uflogo.png.moved.
Conflict adding file heads/wxl.png. Moved existing file to heads/wxl.png.moved.

Revision history for this message
Daniel Holbach (dholbach) wrote :

Reviewed up to line 300.

Revision history for this message
Elfy (elfy) wrote :

Reviewed to line 454.

Note - before I go much further, not that convinced we should be removing someone from this if user is still a member but website is gone.

Revision history for this message
Elfy (elfy) wrote :

further to chat elsewhere ...

reviewed to line 799

Revision history for this message
Elfy (elfy) wrote :

line 1002

Revision history for this message
Elfy (elfy) wrote :

line 1125

Revision history for this message
Elfy (elfy) wrote :

note -re jbicha/darkxst for gnome blog

Revision history for this message
Elfy (elfy) wrote :

got to the end ...

Revision history for this message
Elfy (elfy) wrote :

Inline comments for changes required. Other than that looks ok to me.

review: Needs Fixing
Revision history for this message
Elizabeth K. Joseph (lyz) wrote :

Thanks elfy. For Kubuntu I've added a task to our Trello board to reach out to them, we should do that after this merge since it's unrelated and I don't want to create more conflicts with them adding something now :)

Revision history for this message
Pasi Lallinaho (knome) wrote :

Since me doing the changes and proposing a new merge would mean that you'd have to go through a full diff *again*, so I propose that somebody in the CC does the merge, manually dropping in the changes elfy asked for.

Since you can merge the branch locally before pushing, it should be relatively easy and then you can have one or two commits, however you wish.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: