External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-14 09:44:47 -03:30
Code Issues Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
sundeep-co-in
2016-10-27 08:13:02 +05:30
parent be93cb488c 2c8d295132
commit c1a5fb3312
18 changed files with 4939 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -184,7 +184,7 @@ UI_RELEASE_FLAG_FILE = awx/ui/.release_built
deb deb-src debian debsign pbuilder reprepro setup_tarball \
virtualbox-ovf virtualbox-centos-7 virtualbox-centos-6 \
clean-bundle setup_bundle_tarball \
ui-docker-machine ui-docker ui-release \
ui-docker-machine ui-docker ui-release ui-devel \
ui-test ui-deps ui-test-ci ui-test-saucelabs jlaska
@@ -574,6 +574,10 @@ ui-docker-machine: $(UI_DEPS_FLAG_FILE)
ui-docker: $(UI_DEPS_FLAG_FILE)
$(NPM_BIN) --prefix awx/ui run build-docker-cid
# Builds UI with development/debug settings enabled. Does not raise browser-sync or filesystem polling.
ui-devel: $(UI_DEPS_FLAG_FILE)
$(NPM_BIN) --prefix awx/ui run build-devel
ui-release: languages $(UI_RELEASE_FLAG_FILE)
# todo: include languages target when .po deliverables are added to source control