From f587aefb984216b86154dc5e627dbe7786fe34f9 Mon Sep 17 00:00:00 2001 From: Diana Lau Date: Thu, 22 Feb 2018 22:36:27 -0500 Subject: [PATCH 1/3] docs(faq): add Crafting LB4 link --- pages/en/lb4/FAQ.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/en/lb4/FAQ.md b/pages/en/lb4/FAQ.md index f5acd3804..e00b4e0fa 100644 --- a/pages/en/lb4/FAQ.md +++ b/pages/en/lb4/FAQ.md @@ -16,6 +16,8 @@ summary: LoopBack 4 is a completely new framework, sometimes referred to as Loop - Suitable for small and large teams - Minimally opinionated, enforce your team's opinions instead +See [Crafting LoopBack 4](Crafting-LoopBack-4.html) for more details. + ### What’s the timeline for LoopBack 4? See [Upcoming releases](https://github.com/strongloop/loopback-next/wiki/Upcoming-Releases). From 30e8fba91bd627ba0019770262e0dff74992e001 Mon Sep 17 00:00:00 2001 From: Ryan Graham Date: Fri, 23 Feb 2018 10:01:27 -0800 Subject: [PATCH 2/3] ci: better detect target branch If a build is running on a pull request build then we need to detect the branch name differently than if we are building on a branch job. --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 641ea90c1..08780e5fa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,6 +7,8 @@ def gitEnv = [ 'GIT_AUTHOR_EMAIL=slnode@ca.ibm.com', ] +env.CHANGE_BRANCH = env.CHANGE_BRANCH ?: env.BRANCH_NAME + node('linux && git') { stage('checkout') { checkout scm @@ -32,7 +34,7 @@ node('linux && git') { sh 'git commit -m "Update READMEs from other repos"' } sshagent(credentials: ['loopback-io-deploy']) { - sh 'git push origin HEAD:$BRANCH_NAME' + sh 'git push origin HEAD:$CHANGE_BRANCH' } } else { echo "No updates to commit" From cc9cb1205d6e2fc63c48a53e31dd449cc99bbdb1 Mon Sep 17 00:00:00 2001 From: StrongLoop Bot Date: Fri, 23 Feb 2018 12:10:27 -0600 Subject: [PATCH 3/3] Update READMEs from other repos --- pages/en/lb3/readmes/loopback-connector-cloudant.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/en/lb3/readmes/loopback-connector-cloudant.md b/pages/en/lb3/readmes/loopback-connector-cloudant.md index b26517f33..7fd5ec4cb 100644 --- a/pages/en/lb3/readmes/loopback-connector-cloudant.md +++ b/pages/en/lb3/readmes/loopback-connector-cloudant.md @@ -164,7 +164,7 @@ Property        | Type | Description ----------| -----| -------- database | String | Database name modelIndex | String | Specify the model name to document mapping, defaults to `loopback__model__name`. -modelSelector | JSON | Use the Cloudant Query selector syntax to associate models to existing data. NOTE: modelSelector and modelIndex are mutually exclusive; see [Selector syntax](https://docs.cloudant.com/cloudant_query.html#selector-syntax). +modelSelector | JSON | Use the Cloudant Query selector syntax to associate models to existing data. NOTE: modelSelector and modelIndex are mutually exclusive; see [Selector syntax](https://console.bluemix.net/docs/services/Cloudant/api/cloudant_query.html#selector-syntax). ### _rev Property