Commit Graph

9559 Commits

Author SHA1 Message Date
John Cowen 43a6ebc7bd
Merge pull request #4247 from hashicorp/feature/acl-sort-by-name
UI - Sort ACL tokens by name
2018-06-20 09:18:36 +01:00
John Cowen 5016899964
Merge pull request #4242 from hashicorp/feature/ui-code-editor-autosizing
Sets code editor height to be automatic (growable), with a reasonable min height
2018-06-20 09:18:14 +01:00
John Cowen 75d4757155
Merge pull request #4241 from hashicorp/bugfix/gh-4203-multi-tags
[BUGFIX] Ensure all tags for a service are listed on the service detail page
2018-06-20 09:17:40 +01:00
John Cowen 452888e6ad
Merge branch 'master' into bugfix/gh-4203-multi-tags 2018-06-20 09:17:23 +01:00
John Cowen 145c05aeb2
Merge pull request #4228 from hashicorp/feature/minor-css-amends
UI - minor css amends
2018-06-20 09:15:34 +01:00
Matt Keeler bfe2fcbdf1 Update the runtime tests 2018-06-19 13:59:26 -04:00
Matt Keeler 5c9275c60b Update ui-v2 makefile to handle updating node_modules when needed
Also dont include the dist and node_modules folders in the build context.
2018-06-19 13:51:49 -04:00
Matt Keeler 2d863b8d4c PR Updates 2018-06-19 12:47:58 -04:00
Matt Keeler 36e789e957 Fix a couple find warnings on linux
Additionally add the ability to use go install for dev builds rather than gox (travis doesn’t have gox)
2018-06-19 10:49:07 -04:00
Matt Keeler b9d1e7042a Make filtering out TXT RRs only apply when they would end up in Additional section
ANY queries are no longer affected.
2018-06-19 10:08:16 -04:00
John Cowen 0e3d855734 Sort ACL tokens by name 2018-06-19 10:51:31 +01:00
John Cowen 6bae5e431c Make sure the body background is white 2018-06-19 10:25:41 +01:00
Matt Keeler 5fc30a4e6f Allow for building pre-releases/rcs/betas 2018-06-18 17:06:38 -04:00
Omar Khawaja da12d8a88c
update encryption doc and add guide for creating certificates (#4238)
* update encryption doc and add guide for creating certificates in consul with cfssl

* add details about CLI and disabling HTTP

* delete $ symbols and add guide elements

* add missing periods and steps heading
2018-06-18 15:25:35 -04:00
Siva 7442f32b94 Merge branch 'master' of github.com:hashicorp/consul into WinService 2018-06-18 14:55:38 -04:00
Siva a2e93ebaa5 Added Side Effect import for Windows Service 2018-06-18 14:55:11 -04:00
Matt Keeler 7f4e18d3d1 Quote $@ when passing around 2018-06-18 14:53:50 -04:00
Siva 80c452b5de Added Hook for Windows Service 2018-06-18 14:49:59 -04:00
Stanley Shilov 51731e13be Sessions TTL should be of type string in ui-v2 2018-06-18 13:41:22 -05:00
Matt Keeler c550eb899d Quote some make vars 2018-06-18 14:39:34 -04:00
John Cowen 7cd5e413ee Sets code editor height to be auto, with a reasonable min height 2018-06-18 19:07:57 +01:00
John Cowen e4d71e637a
Merge pull request #4235 from hashicorp/bugfix/move-rsync-to-test
Move the rsync dependency to the test scripts
2018-06-18 19:00:27 +01:00
Matt Keeler 5f6f48bf63 Fix gpg_key usage, also make the location of the binary to check the version of overridable 2018-06-18 13:42:46 -04:00
Matt Keeler 0b42917150 Don’t automatically populate release with dev when not generating a version based off git vars 2018-06-18 13:20:12 -04:00
Matt Keeler 0563be5d2d Set the binary type 2018-06-18 13:09:41 -04:00
Matt Keeler 1031a2bbf8 Pass the right var to git_push_ref 2018-06-18 12:34:30 -04:00
Matt Keeler c59afc119a Return early when git changes are denied 2018-06-18 12:33:59 -04:00
Matt Keeler b4d8d9b9ea Fixup version release detection 2018-06-18 11:57:35 -04:00
Matt Keeler b6aecb2d77 Refactor a little to accomodate overriding packaging using directories 2018-06-18 11:33:16 -04:00
John Cowen b7a15e6616 Ensure all tags for a service are listed on the service detail page 2018-06-18 15:38:52 +01:00
Matt Keeler 74d2806cc1 Use CONSUL_PKG_NAME in package_release 2018-06-18 10:26:04 -04:00
Matt Keeler c94c212e97 Fix a bug in parse_version that prevented using auxillary version files 2018-06-18 10:07:29 -04:00
Matt Keeler e7b0a729ea Only remove builds with the same suffix 2018-06-18 09:57:12 -04:00
Matt Keeler 588cfbb359 Add notion of a consul pkg name to coexist with enterprise 2018-06-18 09:32:00 -04:00
Matt Keeler 551cf5a77b Make sure to commit all version*.go files 2018-06-18 09:22:31 -04:00
Matt Keeler 7d2c8689f5 Update the name of a function source 2018-06-18 09:21:38 -04:00
Matt Keeler ade900f2b6 Dont override set but null vars 2018-06-18 09:16:08 -04:00
Matt Keeler f6d1aa8fc3 Make some room for overrides of build system functions 2018-06-18 09:06:57 -04:00
Matt Keeler e542e63031 Generalize git pushing in a bash function 2018-06-15 20:42:07 -04:00
Matt Keeler 3884d10de4 Add rsync so the ui can build again
Also add back the init target to the ui-v2 makefile
2018-06-15 14:44:14 -04:00
Matt Keeler 9653a66f92 Merge remote-tracking branch 'origin/master' into release-build-updates
# Conflicts:
#	scripts/consul-builder/Dockerfile
#	ui-v2/GNUmakefile
2018-06-15 14:40:09 -04:00
Jack Pearkes ce4c312ef2
Merge pull request #4233 from fossas/master
Fix invalid vendor.json syntax for go-discover
2018-06-15 09:10:29 -07:00
John Cowen 81cb065a04 Move the rsync dependency to the test scripts for now.
1. You only need the fixtures for testing, don't force rsync on people
for just building
2. Eventually this will go and be replaced by something broccoli-y
2018-06-15 16:11:14 +01:00
Matt Keeler 9cb81dc47e Switch over to defaulting to the new UI 2018-06-15 09:20:13 -04:00
John Cowen 3d1f4e59a8 Find a way to test pre-ember load
1. Also add index.html things to test/index.html
2. Use content-for to hedge against keeping content in sync (requires an
addon)
3. Test passes but only when run on its own, as we need to rely on
content in the QUnit runner, theoretically it is not running our test in
isolation. Skipping the test for the moment so we don't have a filaing
test when all run together
2018-06-15 13:56:45 +01:00
Matt Keeler 1aac7c7081 Add capability to put tree back into dev mode via make dev-tree 2018-06-15 08:00:12 -04:00
Leo Zhang b498816e80
Fix invalid vendor.json syntax for go-discover 2018-06-15 02:02:12 -07:00
Matt Keeler 57aa738416 Update the scripting
Automated putting the source tree into release mode.
2018-06-14 21:42:47 -04:00
Matt Keeler 500151a4f9
Merge pull request #4229 from hashicorp/mitchellh/builder-rsync
Add rsync to consul-builder
2018-06-14 13:06:24 -04:00
Mitchell Hashimoto 119e905ffb
Add rsync to consul-builder
The V2 UI build now requires `rsync` to be installed as part of its build process.

Without this, `make ui` will fail today.
2018-06-14 09:59:10 -07:00