Merge branch 'ce-to-ee' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee

91f81538 · Dmitriy Zaporozhets · e6f0db60 · 0e4779fc · 91f81538 · 91f81538
Commit 91f81538 authored Mar 07, 2017 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/policies/group_policy.rb app/policies/group_policy.rb +1 -1

config/webpack.config.js config/webpack.config.js +1 -1

No files found.
--- a/app/policies/group_policy.rb
+++ b/app/policies/group_policy.rb
@@ -47,4 +47,4 @@ class GroupPolicy < BasePolicy

    GroupProjectsFinder.new(@subject).execute(@user).any?
  end
-end
+end
\ No newline at end of file
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -186,4 +186,4 @@ if (WEBPACK_REPORT) {
  );
 }

-module.exports = config;
+module.exports = config;
\ No newline at end of file