diff options
| -rw-r--r-- | CHANGELOG.md | 10 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/40092-fix-cluster-size.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/40161-extra-margin-on-svg-logo-in-header.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/bvl-fork-network-memberships-for-deleted-source.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/dm-authorize-admin-oauth-application.yml | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/issue_40058.yml | 5 | ||||
| -rw-r--r-- | doc/development/licensing.md | 6 | ||||
| -rw-r--r-- | spec/support/gitaly.rb | 8 |
9 files changed, 25 insertions, 27 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4294ccaf9b6..f85b78cb277 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 10.1.4 (2017-11-14) + +### Fixed (4 changes) + +- Don't try to create fork network memberships for forks with a missing source. !15366 +- Formats bytes to human reabale number in registry table. +- Prevent error when authorizing an admin-created OAauth application without a set owner. +- Prevents position update for image diff notes. + + ## 10.1.3 (2017-11-10) - [SECURITY] Prevent OAuth phishing attack by presenting detailed wording about app to user during authorization. diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index f0139b5f33a..2218b5705fc 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -129,7 +129,7 @@ margin: 5px 2px 5px -8px; border-radius: $border-radius-default; - svg { + .tanuki-logo { @media (min-width: $screen-sm-min) { margin-right: 8px; } diff --git a/changelogs/unreleased/40092-fix-cluster-size.yml b/changelogs/unreleased/40092-fix-cluster-size.yml deleted file mode 100644 index e7a16c6920c..00000000000 --- a/changelogs/unreleased/40092-fix-cluster-size.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Formats bytes to human reabale number in registry table -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/40161-extra-margin-on-svg-logo-in-header.yml b/changelogs/unreleased/40161-extra-margin-on-svg-logo-in-header.yml new file mode 100644 index 00000000000..fdaa90f0d5d --- /dev/null +++ b/changelogs/unreleased/40161-extra-margin-on-svg-logo-in-header.yml @@ -0,0 +1,5 @@ +--- +title: Remove extra margin from wordmark in header +merge_request: +author: +type: fixed diff --git a/changelogs/unreleased/bvl-fork-network-memberships-for-deleted-source.yml b/changelogs/unreleased/bvl-fork-network-memberships-for-deleted-source.yml deleted file mode 100644 index ae1eb3aedd5..00000000000 --- a/changelogs/unreleased/bvl-fork-network-memberships-for-deleted-source.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Don't try to create fork network memberships for forks with a missing source -merge_request: 15366 -author: -type: fixed diff --git a/changelogs/unreleased/dm-authorize-admin-oauth-application.yml b/changelogs/unreleased/dm-authorize-admin-oauth-application.yml deleted file mode 100644 index 2787485bc28..00000000000 --- a/changelogs/unreleased/dm-authorize-admin-oauth-application.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Prevent error when authorizing an admin-created OAauth application without - a set owner -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/issue_40058.yml b/changelogs/unreleased/issue_40058.yml deleted file mode 100644 index 46e83d947ba..00000000000 --- a/changelogs/unreleased/issue_40058.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Prevents position update for image diff notes -merge_request: -author: -type: fixed diff --git a/doc/development/licensing.md b/doc/development/licensing.md index 902b1c74a42..274923c2d43 100644 --- a/doc/development/licensing.md +++ b/doc/development/licensing.md @@ -4,11 +4,11 @@ GitLab CE is licensed under the terms of the MIT License. GitLab EE is licensed ## Automated Testing -In order to comply with the terms the libraries we use are licensed under, we have to make sure to check new gems for compatible licenses whenever they're added. To automate this process, we use the [license_finder][license_finder] gem by Pivotal. It runs every time a new commit is pushed and verifies that all gems in the bundle use a license that doesn't conflict with the licensing of either GitLab Community Edition or GitLab Enterprise Edition. +In order to comply with the terms the libraries we use are licensed under, we have to make sure to check new gems for compatible licenses whenever they're added. To automate this process, we use the [license_finder][license_finder] gem by Pivotal. It runs every time a new commit is pushed and verifies that all gems and node modules in the bundle use a license that doesn't conflict with the licensing of either GitLab Community Edition or GitLab Enterprise Edition. -There are some limitations with the automated testing, however. CSS and JavaScript libraries, as well as any Ruby libraries not included by way of Bundler, must be verified manually and independently. Take care whenever one such library is used, as automated tests won't catch problematic licenses from them. +There are some limitations with the automated testing, however. CSS, JavaScript, or Ruby libraries which are not included by way of Bundler, NPM, or Yarn (for instance those manually copied into our source tree in the `vendor` directory), must be verified manually and independently. Take care whenever one such library is used, as automated tests won't catch problematic licenses from them. -Some gems may not include their license information in their `gemspec` file. These won't be detected by License Finder, and will have to be verified manually. +Some gems may not include their license information in their `gemspec` file, and some node modules may not include their license information in their `package.json` file. These won't be detected by License Finder, and will have to be verified manually. ### License Finder commands diff --git a/spec/support/gitaly.rb b/spec/support/gitaly.rb index 89fb362cf14..1512b3e0620 100644 --- a/spec/support/gitaly.rb +++ b/spec/support/gitaly.rb @@ -1,6 +1,10 @@ RSpec.configure do |config| config.before(:each) do |example| - next if example.metadata[:skip_gitaly_mock] - allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(true) + if example.metadata[:disable_gitaly] + allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(false) + else + next if example.metadata[:skip_gitaly_mock] + allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(true) + end end end |