diff --git a/release_dashboard/static/release_dashboard/js/build.js b/release_dashboard/static/release_dashboard/js/build.js index f820d26..0c59174 100644 --- a/release_dashboard/static/release_dashboard/js/build.js +++ b/release_dashboard/static/release_dashboard/js/build.js @@ -8,7 +8,7 @@ $('select#common_select').change(function() { if(selected_version.match(/^branch/)) { if(selected_version.match(/^branch\/master/)) { var distribution = $('select#distribution option:selected').val(); - if(!distribution.match(/^auto/)) { + if(distribution && !distribution.match(/^auto/)) { version = 'trunk' + '-' + distribution; } } diff --git a/release_dashboard/views.py b/release_dashboard/views.py index e8d5d69..1dc5834 100644 --- a/release_dashboard/views.py +++ b/release_dashboard/views.py @@ -42,7 +42,7 @@ def index(request): def _projects_versions(projects, regex=None, - tags=True, branches=True): + tags=True, branches=True, master=False): res = [] for project in projects: info = { @@ -52,6 +52,8 @@ def _projects_versions(projects, regex=None, info['tags'] = get_tags(project, regex) if branches: info['branches'] = get_branches(project, regex) + if master: + info['branches'].append('master') res.append(info) logger.debug(res) return res @@ -286,10 +288,11 @@ def build_docker_images(request): regex_mr, False, True, + True, ), 'common_versions': { 'tags': [], - 'branches': [] + 'branches': ['master', ] }, 'docker': True, } diff --git a/t/Dockerfile b/t/Dockerfile index 7bf706d..5b68cd2 100644 --- a/t/Dockerfile +++ b/t/Dockerfile @@ -36,7 +36,7 @@ WORKDIR /code/ # ./t/testrunner # # Run django inside docker: -# % pip install -r t/dev.txt && make run_dev +# % pip install -r requirements/dev.txt && make run_dev # # We need a working rabbit server, so in another terminal: # % docker run --rm --hostname repoapi-rabbit --name repoapi-rabbit rabbitmq:3