Merge lp://staging/~cjohnston/qa-dashboard/dashboard-smoke-2-smoke into lp://staging/qa-dashboard
Proposed by
Chris Johnston
| Status: | Rejected |
|---|---|
| Rejected by: | Chris Johnston |
| Proposed branch: | lp://staging/~cjohnston/qa-dashboard/dashboard-smoke-2-smoke |
| Merge into: | lp://staging/qa-dashboard |
| Prerequisite: | lp://staging/~cjohnston/qa-dashboard/copyright-update |
| Diff against target: |
592 lines (+268/-91) (has conflicts) 19 files modified
common/management/commands/clear_items.py (+4/-1) common/management/commands/list_items.py (+4/-1) common/utils.py (+1/-1) dashboard/migrations/0015_remove_smoke_models.py (+24/-0) dashboard/views/__init__.py (+0/-21) dashboard/views/api/__init__.py (+0/-35) qa_dashboard/settings.py (+1/-0) qa_dashboard/urls.py (+21/-18) scripts/image_play.py (+1/-1) scripts/process_utah_log.py (+1/-1) scripts/static_validation_cleanup.py (+1/-1) smoke/__init__.py (+14/-0) smoke/api.py (+6/-2) smoke/forms.py (+2/-2) smoke/management/commands/jenkins_pull.py (+2/-2) smoke/migrations/0001_initial_smoke_models.py (+163/-0) smoke/migrations/__init__.py (+14/-0) smoke/utah_utils.py (+2/-2) smoke/views.py (+7/-3) Conflict adding files to tests. Created directory. Conflict because tests is not versioned, but has versioned children. Versioned directory. Contents conflict in tests/test_bootspeed_api.py |
| To merge this branch: | bzr merge lp://staging/~cjohnston/qa-dashboard/dashboard-smoke-2-smoke |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chris Johnston | Needs Resubmitting | ||
| Joe Talbott | Needs Fixing | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2013-01-04.
Commit message
Moves smoke code from the dashboard app to the new smoke app
To post a comment you must log in.
Revision history for this message
| Chris Johnston (cjohnston) | # |
review:
Needs Resubmitting
Unmerged revisions
- 208. By Chris Johnston
-
Changes migration to properly detect table name
- 207. By Chris Johnston
-
Fixes imports
- 206. By Chris Johnston
-
Moves smoke from dashboard to smoke app
- 205. By Chris Johnston
-
Updates copyright
- 204. By Chris Johnston
-
More fixes
- 203. By Chris Johnston
-
Copyright tag
- 202. By Chris Johnston
-
Fixes missed import
- 201. By Chris Johnston
-
Moves SRU from dashboard to sru app
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The migrations need fixing so that each table is checked for and added if not found. Similar to the dashboard-sru-2-sru MP comment.