Commit Graph

630 Commits

Author SHA1 Message Date
Grzegorz Bizon 0375948db8 Add missing `CI_COMMIT_BEFORE_SHA` predefined variable 2018-07-12 15:41:08 +02:00
Alexander Tanayno 3888c5115f
updates version for CI_JOB_URL and CI_PIPELINE_URL to 11.1 2018-07-06 20:07:27 +02:00
Marcel Amirault 1285135926 Updated products links to pricing 2018-07-03 00:37:24 +00:00
Kamil Trzciński 6633fbef4e Add CI_{PIPELINE,JOB}_URL 2018-06-12 11:06:33 +02:00
Achilleas Pipinellis 3c9686c96d
Rename Secret variables -> variables 2018-06-06 11:28:54 +02:00
Shinya Maeda eb05d475b7 Fix wording in spec. Add PIPELINE_IID in examples of debugged variables in documants. 2018-06-04 12:12:02 +09:00
Shinya Maeda 09122f93c3 Merge branch 'master' into per-project-pipeline-iid 2018-05-30 14:50:09 +09:00
Tomasz Maczukin 770504baee Add documentation about variables usage in GitLab CI 2018-05-29 17:33:48 +00:00
Marcia Ramos 65bfec654a Merge branch 'docs/redirect-k8s-service-page' into 'master'
Deprecate the Kubernetes service docs

See merge request gitlab-org/gitlab-ce!18837
2018-05-28 14:17:37 +00:00
Shinya Maeda f61666c0d7 Merge branch 'master' into per-project-pipeline-iid 2018-05-22 14:32:40 +09:00
Grzegorz Bizon 723b2471dc Merge branch 'fix/gb/exclude-persisted-variables-from-environment-name' into 'master'
Do not allow to use `CI_PIPELINE_ID` in environment name

Closes #46443

See merge request gitlab-org/gitlab-ce!19032
2018-05-21 13:26:51 +00:00
Grzegorz Bizon 5d462e9d98 Update docs about unsupported environment name variables 2018-05-18 14:12:46 +02:00
Grzegorz Bizon c808de2551 Update variables expressions pattern matching docs 2018-05-17 12:51:23 +02:00
Grzegorz Bizon f52de2f73c Make variables expression pattern case-sensitivity explicit 2018-05-15 15:18:18 +02:00
Grzegorz Bizon 73aee958e2 Add docs on pattern matching syntax in variables expression 2018-05-15 14:51:10 +02:00
Achilleas Pipinellis 2ac407b8d4
Deprecate the Kubernetes service docs 2018-05-09 09:04:06 +02:00
Shinya Maeda 04dc80dbb5 Fix spec 2018-05-08 16:01:18 +09:00
Shinya Maeda 632b87a80e Merge branch 'master' into per-project-pipeline-iid 2018-05-08 14:32:45 +09:00
Tomasz Maczukin 333293bdf6
Document new variables 2018-05-07 17:25:28 +02:00
Kamil Trzciński 07d1d8bd67 Use **CI_PIPELINE_IID** 2018-05-03 10:50:57 +02:00
Shinya Maeda 8192cd70ed Expose CI_PIPELINE_IID_PER_PROJECT variable 2018-05-03 10:48:33 +02:00
Pascal Borreli 12e3eff462 Fixed typos 2018-04-27 08:50:05 +00:00
Marcia Ramos d4fe2a9f35 Merge branch 'better-explain-pipeline-source' into 'master'
Add better explanation for CI_PIPELINE_SOURCE

See merge request gitlab-org/gitlab-ce!18111
2018-04-25 17:52:26 +00:00
Mayra Cabrera 800ee75aa5 Ensure deploy tokens variables are not available in the context of only/except 2018-04-20 12:18:41 -05:00
Mayra Cabrera 0dd6d25c25 Rename special deploy token to make it more descriptive
Also:
- Includes more specs
- Improves a bit the documentation
2018-04-20 12:18:41 -05:00
Mayra Cabrera a6fb079ea3 Add changelog and docs 2018-04-20 12:18:41 -05:00
Grzegorz Bizon 847f1667c8 Document unsupported variables for dynamic environments 2018-04-06 10:41:58 +02:00
Grzegorz Bizon 323bac4a6e Improve docs about pipeline variables expressions 2018-04-05 11:30:02 +02:00
Fabio Busatto 483fe24b74 Add better explanation for CI_PIPELINE_SOURCE 2018-03-30 14:45:57 +00:00
Grzegorz Bizon f4d81536ac Copy-edit documentation for variables expressions 2018-03-29 11:25:49 +02:00
Grzegorz Bizon 6ed2370b85 Add basic docs for variables expressions feature 2018-03-28 14:00:53 +02:00
Achilleas Pipinellis 93e45424d0
Cleanup and consolidate the CI yaml docs 2018-03-07 11:32:38 +01:00
Rémy Coutable b07b2ea5b5 Merge branch 'patch-28' into 'master'
Document new job variables: CI_RUNNER_{REVISION,VERSION,EXECUTABLE_ARCH}

See merge request gitlab-org/gitlab-ce!16834
2018-02-28 16:44:29 +00:00
Taylor Braun-Jones c49381057a Add new job variables: CI_RUNNER_{REVISION,VERSION,EXECUTABLE_ARCH}
As introduced by gitlab-org/gitlab-runner!788
2018-02-28 08:36:11 -05:00
Kamil Trzciński a55cfc1e63 Merge branch 'ce-39118-dynamic-pipeline-variables-fe' into 'master'
Dynamic CI secret variables -- CE backport

See merge request gitlab-org/gitlab-ce!16842
2018-02-07 12:23:36 +00:00
Achilleas Pipinellis 41cd11d5b8
Change docs links to https://about.gitlab.com/products/ 2018-02-07 12:47:56 +01:00
Eric Eastwood 3be32027b6 Use dynamic variable list in scheduled pipelines and group/project CI secret variables
See https://gitlab.com/gitlab-org/gitlab-ce/issues/39118

Conflicts:
	app/views/ci/variables/_form.html.haml
	app/views/ci/variables/_table.html.haml
	ee/app/views/ci/variables/_environment_scope.html.haml
	spec/javascripts/ci_variable_list/ci_variable_list_ee_spec.js
	spec/javascripts/fixtures/projects.rb
2018-02-05 13:09:29 -06:00
Marcia Ramos bfab3990f8 search and replace "Enterprise Edition Premium" => "Premium" 2018-02-01 19:13:49 -02:00
Mathijs de Kruyf 8a852dee62 Fix typo in `.gitlab-ci.yml` heading 2018-01-24 12:03:12 +00:00
Ville Skyttä 0cbbb08e79 doc: Spelling fixes 2018-01-19 12:09:59 +02:00
Achilleas Pipinellis f06982bf92
Make usage of SSH keys in CI/CD more clear 2017-12-13 10:49:59 +01:00
Matija Čupić 576f0a5a6d Expose project visibility as CI variable 2017-11-04 04:46:29 +01:00
Marcia Ramos 101779e4e9 Merge branch 'docs/ci-disposable-env-fix' into 'master'
Fix wording on CI disposable variables

See merge request gitlab-org/gitlab-ce!14983
2017-11-01 16:56:06 +00:00
Achilleas Pipinellis 69b4c5c011 Exclude comments from specific docs 2017-11-01 15:56:40 +00:00
Achilleas Pipinellis 126c4d9952
Fix wording on CI disposable variables 2017-10-21 21:06:23 +03:00
Alessio Caiazza 79ed79df7d Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT` 2017-10-21 09:22:00 +00:00
Achilleas Pipinellis da05687d90
Update a bunch of docs images 2017-10-04 15:47:59 +02:00
Achilleas Pipinellis 544739a048 Clarify what variables can be used under `environment:` 2017-09-14 18:01:54 +02:00
Grzegorz Bizon 896e5f5031 Merge branch '26692-predefined-variable-gitlab-user-name' into 'master'
Resolve "Predefined Variable GITLAB_USER_NAME"

Closes #26692

See merge request !13824
2017-08-31 10:03:07 +00:00
Mark Fletcher 22d5cca8a7 Add a Build Variable to represent the triggering GitLab user's login username
* Predefined variable represents the username of the GitLab user that started a build
2017-08-30 11:25:30 +08:00
Mark Fletcher 91cca6e494 Add a Build Variable to represent the triggering GitLab user's name
* Predefined variable represents the name of the GitLab user that started a build
2017-08-30 11:24:59 +08:00
Fabio Busatto a919188ccf Update README.md 2017-08-24 14:40:38 +00:00
Zeger-Jan van de Weg a99b2d8e12
Expose CI_PIPELINE_SOURCE on CI jobs
It was missing and expected it wouldn't hurt anyone
2017-08-23 13:14:49 +02:00
Shinya Maeda e0c150da2f Merge from master(Fix conflicts) 2017-07-07 22:33:32 +09:00
Shinya Maeda 08fba1327f merge from master 2017-07-07 16:12:13 +09:00
Achilleas Pipinellis d633bf0afb Copyedit docs for group-level secret variables
[ci skip]
2017-07-07 15:35:12 +09:00
Shinya Maeda 5b0954759c Basic BE change
Fix static-snalysis

Move the precedence of group secure variable before project secure variable. Allow project_id to be null.

Separate Ci::VariableProject and Ci::VariableGroup

Add the forgotton files

Add migration file to update type of ci_variables

Fix form_for fpr VariableProject

Fix test

Change the table structure according to the yorik advice

Add necessary migration files. Remove unnecessary migration spec.

Revert safe_model_attributes.yml

Fix models

Fix spec

Avoid self.variable. Use becomes for correct routing.

Use unique index on group_id and key

Add null: false for t.timestamps

Fix schema version

Rename VariableProject and VariableGroup to ProjectVariable and GroupVariable

Rename the rest of them

Add the rest of files

Basic BE change

Fix static-snalysis

Move the precedence of group secure variable before project secure variable. Allow project_id to be null.

Separate Ci::VariableProject and Ci::VariableGroup

Add the forgotton files

Add migration file to update type of ci_variables

Fix form_for fpr VariableProject

Fix test

Change the table structure according to the yorik advice

Add necessary migration files. Remove unnecessary migration spec.

Revert safe_model_attributes.yml

Fix models

Fix spec

Avoid self.variable. Use becomes for correct routing.

Use unique index on group_id and key

Add null: false for t.timestamps

Fix schema version

Rename VariableProject and VariableGroup to ProjectVariable and GroupVariable

Rename the rest of them

Add the rest of files

Implement CURD

Rename codes related to VariableGroup and VariableProject FE part

Remove unneccesary changes

Make Fe code up-to-date

Add protected flag to migration file

Protected group variables essential package

Update schema

Improve doc

Fix logic and spec for models

Fix logic and spec for controllers

 Fix logic and spec for views(pre feature)

Add feature spec

Fixed bugs. placeholder. reveal button. doc.

Add changelog

Remove unnecessary comment

godfat nice catches

Improve secret_variables_for arctecture

Fix spec

Fix StaticAnlysys & path_regex spec

Revert "Improve secret_variables_for arctecture"

This reverts commit c3216ca212322ecf6ca534cb12ce75811a4e77f1.

Use ayufan suggestion for secret_variables_for

Use find instead of find_by

Fix spec message for variable is invalid

Fix spec remove variable.group_id = group.id

godffat spec nitpicks

Use include Gitlab::Routing.url_helpers for presenter spec
2017-07-07 15:33:17 +09:00
Lin Jen-Shin d9435d6121 Backports for ee-2112
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2112
2017-07-06 16:25:03 +08:00
Shinya Maeda 0d51f4f600 Revert unnecesary changes in doc/ci/variables/README.md 2017-07-06 01:21:19 +09:00
Lin Jen-Shin 33a5157ad4 Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Config-Path
* upstream/master: (149 commits)
  Revert change to design. Go back to scrollable page
  Fixes the column widths for the new navigation options in settings
  Migrate #submodule_url_for to Gitaly
  Add test example for external commit status retries
  Fix invalid Rails.logger call in lib/gitlab/health_checks/fs_shards_check.rb
  Fix build for !12300.
  Log rescued exceptions to Sentry
  Fix issues with non-UTF8 filenames by always fixing the encoding of tree and blob paths
  Revert "Merge branch 'revert-12499' into 'master'"
  Prevent accidental deletion of protected MR source branch by repeating checks before actual deletion
  Improve the overall UX for the new monitoring dashboard
  Document that GitLab 9.3 requires the TRIGGER permission on MySQL
  Instrument Unicorn with Ruby exporter
  Remove group modal like remove project modal. Closes #33130
  Update prometheus client gem
  Enables the option in user preferences to turn on the new navigation
  Add Jasmine tests for `OAuthRememberMe`
  Simplify authentication logic in the v4 users API for !12445.
  Use stub_application_setting when testing ApplicationHelper#support_url
  wait_for_requests is not needed when AJAX is not in play
  ...
2017-07-05 22:05:39 +08:00
Shinya Maeda 324cfe0f9b Fix spec. Add PipelineScheduleVariable for import_export 2017-07-05 18:38:35 +09:00
Eric Eastwood 2dba0cf0be Add docs for scheduled pipeline variables
See https://gitlab.com/gitlab-org/gitlab-ce/issues/32568
2017-07-05 18:38:32 +09:00
Shinya Maeda b6f41544d8 Fix spec. Add PipelineScheduleVariable for import_export 2017-07-05 18:36:19 +09:00
Eric Eastwood 888ce89295 Add docs for scheduled pipeline variables
See https://gitlab.com/gitlab-org/gitlab-ce/issues/32568
2017-07-05 18:36:19 +09:00
Lin Jen-Shin d7c32c5870 Fix various descriptions given the feedback 2017-07-04 02:00:50 +08:00
Lin Jen-Shin 057c3c4e31 Introduce CI_CONFIG_PATH 2017-06-30 16:14:48 +08:00
Stefan Hanreich f4c05e0380 no trailing / leading hyphens in CI_COMMIT_REF_SLUG. Fixes #32035 2017-06-18 23:57:22 +02:00
Achilleas Pipinellis 268d9f8f04 Refactor CI triggers docs 2017-06-08 13:56:19 +02:00
Sean Packham de12e4e204 Merge branch 'docs/powershell-ci-vars' into 'master'
Add PowerShell to CI variable docs

See merge request !11935
2017-06-06 14:30:08 +00:00
John Spaetzel 1d0219a526 Add PowerShell to CI variable docs 2017-06-06 15:02:03 +02:00
Tor Bechmann Yamamoto-Sørensen c4878a762f Update explanation of job-level variable override to fit example 2017-06-06 16:59:53 +09:00
Kamil Trzciński 65581fad5e Merge branch '31061-26135-ci-project-slug-enviroment-variables' into 'master'
Add slugified project path to CI environment variables

Closes #31061

See merge request !11838
2017-06-05 10:25:35 +00:00
Kamil Trzciński f71106425c Merge branch '25680-CI_ENVIRONMENT_URL' into 'master'
Add `$CI_ENVIRONMENT_URL` as a job variable

Closes #25680

See merge request !11695
2017-06-05 07:03:39 +00:00
Sébastien 846b478d3c Resolve "Documentation of `.gitlab-ci.yml` states incorrect example for variables" 2017-06-04 06:14:42 +00:00
vanadium23 3f80281d9c Add slugify project path to CI enviroment variables 2017-06-03 10:36:41 +03:00
Lin Jen-Shin b01bc0a036 Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URL
* upstream/master: (39 commits)
  Resolve "Improve Container Registry description"
  Add username parameter to gravatar URL
  Fix replying to a commit discussion displayed in the context of an MR
  Add fog-aliyun as backup storage provider
  Add missing specs
  Make sure protected can't be null; Test protected!
  Update session cookie key name to be unique to instance in development
  Just mention which GitLab version is required
  Fix data inconsistency issue for old artifacts by moving them to a currently used path
  Fix N+1 queries for non-members in comment threads
  Fix rubocop in spec/helpers/diff_helper_spec.rb
  Merge two items into one in the doc
  Only remove FK if it exists
  Maintain notes avatar at smaller breakpoint
  Fix pipeline schedule value name in documentation
  Add test for Project#protected_for?
  Update diff discussion position per discussion instead of per note
  Display Shared Runner status in Admin Dashboard
  Make sure we're loading the fresh variables
  Now secret_variables_for would return the variables
  ...
2017-06-02 04:24:57 +08:00
Lin Jen-Shin 0ab8c852db Just mention which GitLab version is required
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11688/diffs#note_31277454
2017-06-01 21:22:38 +08:00
Lin Jen-Shin fb70cf077c Merge two items into one in the doc 2017-06-01 16:43:07 +08:00
Lin Jen-Shin 76e738fc0e Fix doc table of contents 2017-05-31 22:52:37 +08:00
Lin Jen-Shin c4dded593a Update docs and use protected secret variable as the name 2017-05-31 22:45:51 +08:00
Lin Jen-Shin 9cc918a5ca Use be_truthy and add back missing link 2017-05-26 15:35:30 +08:00
Lin Jen-Shin 88ba7a034b Pass external_url from environment if job doesn't have one
Also update the document and add a changelog entry
2017-05-25 23:08:11 +08:00
Lin Jen-Shin ef10f4c531 Add docs for protected variables 2017-05-25 20:29:12 +08:00
Dmitriy Zaporozhets a4407e75d3 Merge branch 'dz-rename-pipelines-settings-tab' into 'master'
Rename CI/CD Pipelines to Pipelines in the project settings

Closes #31980

See merge request !11305
2017-05-22 14:17:48 +00:00
Dmitriy Zaporozhets 9189cffb93
Rename CI/CD Pipelines references to just Pipelines in docs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-05-11 22:21:14 +03:00
Elan Ruusamäe 54abddf1e0 fix $CI_JOB_ID variable
introduced with rename variables commit: a084437b5c
2017-04-27 14:12:29 +00:00
Achilleas Pipinellis f18e05b9a4 Remove wrong user email from CI variables example output
[ci skip]
2017-04-07 20:51:38 +02:00
Mustafa YILDIRIM 2fa10f57c2 fix spelling CI_REPOSITORY_URL (line:355) gitab-ci-token to gitlab-ci-token. 2017-04-03 12:19:11 +00:00
Johan Brandhorst 422f015a5a Correct example value variable name.
CI_REPOSITORY_URL is the correct name.
2017-03-27 13:29:42 +00:00
Zeger-Jan van de Weg 98c4d8a0e1 Fix Slack link when on notify 2017-03-16 23:27:42 +00:00
Z.J. van de Weg 3ebd29b538 Futher rename the CI variables 2017-03-16 08:49:01 +01:00
Achilleas Pipinellis 90d7b95ae1 Move example variables output to bottom
[ci skip]
2017-03-09 13:06:11 +01:00
Achilleas Pipinellis 91c2b4ce33 Cleanup CI variables table and add a deprecation note
[ci skip]
2017-03-09 10:19:37 +01:00
Z.J. van de Weg 993a1edd4f Rename REF to SHA 2017-03-07 17:37:05 +01:00
Z.J. van de Weg 9c25404ac0 Rename BUILD to JOB in CI Variables
Given GitLab moves away from using the term build, everywhere, also the
CI variables are being renamed.

For now, both `CI_BUILD_X` and `CI_JOB_X` are supported, with the same
values. However, in about 3 months, support will be dropped.
2017-03-07 15:41:13 +01:00
Pawel Chojnacki d13669c98b Remove remnants of git annex 2017-03-03 18:33:47 +01:00
TeNNoX c1b5795705 Add note about how to use or escape variables inside other variables 2017-02-28 23:49:28 +00:00
J. B. Rainsberger 3d8c4c903c Fixed instructions for adding Secret Variables to a CI/CD pipeline. 2017-02-23 17:24:34 +00:00
Achilleas Pipinellis a084437b5c Rename builds to jobs in docs
[ci skip]
2017-02-15 12:12:35 +01:00
Achilleas Pipinellis a6ac23250a Move project services to new location under Integrations 2017-02-03 20:28:47 +01:00
Kamil Trzciński 8dd02443e9 Merge branch 'feature/runner-script-attempts-docs' into 'master'
Add new runner script attempts docs and update .gitlab-ci.yml

Related: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1907 and https://gitlab.com/gitlab-com/infrastructure/issues/685

Adds missing docs about the new script attempts variables in the runner.

See merge request !8100
2016-12-18 22:37:17 +00:00
Adam Niedzielski c945a0a714 Pass variables from deployment project services to CI runner
This commit introduces the concept of deployment variables - variables
that are collected from deployment services and passed to CI runner
during a deployment build.
Deployment services specify the variables by overriding
"predefined_variables" method.

This commit also configures variables for KubernetesService
2016-12-16 13:24:03 +01:00
Nick Thomas 80513a1295 Add $CI_ENVIRONMENT_NAME and $CI_ENVIRONMENT_SLUG 2016-12-15 14:17:58 +00:00
James Lopez 0ddc5f667e add new runner script attempts docs and update .gitlab-ci.yml 2016-12-15 12:40:33 +01:00
Nick Thomas 1fdd5d6823 Introduce $CI_BUILD_REF_SLUG 2016-12-13 19:31:23 +00:00
Achilleas Pipinellis cfb35cd7fd It's secret variables, not secure
[ci skip]
2016-12-05 23:02:10 +01:00
Achilleas Pipinellis 4c7c66a93e Fix dead links, add example of debug trace output, simplify titles
[ci skip]
2016-12-05 22:46:13 +01:00
Achilleas Pipinellis 07c3d2cafa Refactor CI variables docs 2016-11-25 14:41:46 +01:00
Nick Thomas c64721f163 Document the new CI_DEBUG_TRACE variable
[ci skip]
2016-10-11 12:42:37 +01:00
Johan Brandhorst dd1c954224 Fix typo in README.md 2016-09-14 10:11:38 +00:00
Sergey Gnuskov 0f73dd34fe Add information about user and manual build start to runner as variables 2016-09-09 12:09:16 +03:00
Patrick Thaele fd5c86aa2d Fix: Switch sample values for $CI_SERVER_REVISION and $CI_SERVER_VERSION. 2016-09-07 12:56:50 +00:00
Mark Pundsack 4e321b01c6 Explain CI_PROJECT_NAMESPACE better 2016-07-21 11:33:07 -07:00
Kamil Trzcinski 8eafdafdda Fix review comments 2016-07-20 14:00:25 +02:00
Kamil Trzcinski c3882eb4ee Improve implementation of variables 2016-07-20 13:17:21 +02:00
Kamil Trzcinski 3c3e50f9cb Update documentation 2016-07-20 00:17:19 +02:00
Kamil Trzcinski e6cbd62684 Update all exposed variables to CI builds 2016-07-20 00:15:18 +02:00
Kamil Trzcinski 0aedeb5637 Add predefined CI variables to GitLab for container registry, pipelines, project name, etc. 2016-06-21 14:03:13 +02:00
Mark Pundsack 6d9ed76419 Document CI_BUILD_TOKEN 2016-06-14 21:26:38 -07:00
Grzegorz Bizon 2972a991df Add minor fixes in docs for job-specific variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon a2957291b3 Update documentation on job level build variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon a264973905 Improve grammar in CI documentation for build vars 2016-04-18 13:17:48 +02:00
Grzegorz Bizon 5d89bdb16a Add documentation for job-level build variables 2016-04-18 13:17:48 +02:00
Achilleas Pipinellis 141783d592 Add link to triggers doc in variables section
[ci skip]
2016-03-01 09:57:09 +02:00
Richard Hansen 458e3c7167 fix table in doc/ci/variables/README.md 2016-02-16 15:02:18 -05:00
Kamil Trzcinski 078ec5e414 Add information about expose of build variables. 2016-02-09 01:08:49 +01:00
Henning Hoefer d14ed863f7 Add note about minimum GitLab CI version 2016-01-20 12:47:51 +00:00
Cauan Cabral d2b5ef1c1e Remove CI_BUILD_BEFORE_SHA from CI documentation
As pointed in #3210, the environment variable isn't usable any more.
2015-12-16 14:23:02 -03:00
Kamil Trzcinski 7b5ab3ded5 Added CI_BUILD_TAG, _STAGE, _NAME and _TRIGGERED to CI builds 2015-10-14 17:28:17 +02:00
Douwe Maan 046b283127 Groundwork for merging CI into CE 2015-08-25 18:42:46 -07:00