mno-enterprise-api 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4634cd921bb1ad61aa2d22d2f87ec8f8f743a6eb
-  data.tar.gz: 5c9e5f8551ad2c50d31a8f97b36a4636b9612076
+  metadata.gz: 3d818ac83f5c1edcd4922dbce717a4120888c100
+  data.tar.gz: 156f2605295d07e5139db922c4e2b7e486fef7cb
 SHA512:
-  metadata.gz: 049b8bca7b97ba5ecbdf7f33744bb36a76a50de88c85340123c58b0f7838b8e32d9b01760a9d68f5a8ec4f102fbb609715f99d152abecad462f8fc49a7a7f395
-  data.tar.gz: 9c9487907c76667e0ad38df08a9ac4a51f488f3ce8b06719a2708badde5a0e4866f8e9d44081df083458114413fc5eb5d88536a4bc8e6f27842053f91450da11
+  metadata.gz: e7fd434751d41e4d38b0bafdda15fc5523f85f78aa3bacf138ff4bbf1d65a74f5ac722d96f410ef54b00fa3ce4ae1ceea7db7bd11847cc25ca7cb09528eb003c
+  data.tar.gz: 0285c46aaf0d3bae34a5a1c3b69dc7e87b99070dfd139108cc8deee634fa4ab66c3fb7dbd1c710add2f61d24a6ee8aa091cfa8b3bd77bc4a47a3bdc62f474905

data/app/controllers/mno_enterprise/jpi/v1/admin/audit_events_controller.rb

@@ -1,6 +1,6 @@
 module MnoEnterprise
   class Jpi::V1::Admin::AuditEventsController < Jpi::V1::Admin::BaseResourceController
-    
+
     # GET /mnoe/jpi/v1/admin/audit_events
     def index
       @audit_events = MnoEnterprise::AuditEvent
@@ -8,7 +8,7 @@ module MnoEnterprise
       @audit_events = @audit_events.skip(params[:offset]) if params[:offset]
       @audit_events = @audit_events.order_by(params[:order_by]) if params[:order_by]
       @audit_events = @audit_events.where(params[:where]) if params[:where]
-      @audit_events = @audit_events.all
+      @audit_events = @audit_events.all.fetch
 
       response.headers['X-Total-Count'] = @audit_events.metadata[:pagination][:count]
     end

data/app/controllers/mno_enterprise/jpi/v1/admin/organizations_controller.rb

@@ -15,7 +15,7 @@ module MnoEnterprise
         @organizations = @organizations.skip(params[:offset]) if params[:offset]
         @organizations = @organizations.order_by(params[:order_by]) if params[:order_by]
         @organizations = @organizations.where(params[:where]) if params[:where]
-        @organizations = @organizations.all
+        @organizations = @organizations.all.fetch
         response.headers['X-Total-Count'] = @organizations.metadata[:pagination][:count]
       end
     end

data/app/controllers/mno_enterprise/jpi/v1/admin/users_controller.rb

@@ -15,7 +15,7 @@ module MnoEnterprise
         @users = @users.skip(params[:offset]) if params[:offset]
         @users = @users.order_by(params[:order_by]) if params[:order_by]
         @users = @users.where(params[:where]) if params[:where]
-        @users = @users.all
+        @users = @users.all.fetch
         response.headers['X-Total-Count'] = @users.metadata[:pagination][:count]
       end
     end

data/app/views/mno_enterprise/auth/unlocks/_form.html.haml

@@ -0,0 +1,10 @@
+= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f|
+  = devise_error_messages!
+  %div
+    = f.email_field :email, :placeholder => "Email", :required => true, 'ng-model' => 'email', :class => 'form-control'
+  %br
+  %br/
+  %div
+    %button{ :class => "btn btn-warning btn-login", :type => "submit", 'ng-click' => 'hasClicked = true', 'ng-hide' => 'hasClicked' }
+      = t('mno_enterprise.auth.unlocks.new.unlock')
+    %img.ng-hide{ 'ng-src' => asset_path('mno_enterprise/loader-32x32-bg-inverse.gif'), 'ng-show' => 'hasClicked' }

data/app/views/mno_enterprise/auth/unlocks/new.html.haml

@@ -1,11 +1,11 @@
-%h2= t('.title')
-= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f|
-  = devise_error_messages!
-  .field
-    = f.label :email
-    %br/
-    = f.email_field :email, autofocus: true
-  .actions
-    = f.submit t('.unlock')
-
-= render "devise/shared/links"
+.registration
+  .container
+    .row
+      .login-box-wrapper
+        .login-box-title
+          %h2= t('.title')
+        .login-box
+          .brand-logo
+          = render "mno_enterprise/auth/unlocks/form"
+          %hr
+          = render "mno_enterprise/auth/shared/links"

data/config/initializers/health_check.rb

@@ -1,7 +1,6 @@
-HealthCheck::Engine.routes_manually_defined = true
+HealthCheck::Engine.routes_explicitly_defined = true
 
 HealthCheck.setup do |config|
-
   # Text output upon success
   config.success = 'success'
 
@@ -21,15 +20,14 @@ HealthCheck.setup do |config|
   config.http_status_for_error_object = 500
 
   # You can customize which checks happen on a standard health check
-  config.standard_checks = [ 'database', 'migrations', 'custom' ]
+  config.standard_checks = %w(site cache redis-if-present)
 
   # You can set what tests are run with the 'full' or 'all' parameter
-  config.full_checks = ['database', 'migrations', 'cache', 'custom']
+  config.full_checks = %w(site cache custom redis-if-present sidekiq-redis-if-present)
 
   # Add one or more custom checks that return a blank string if ok, or an error message if there is an error
   config.add_custom_check do
     # any code that returns blank on success and non blank string upon failure
     MnoEnterprise::HealthCheck.perform_mno_hub_check
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mno-enterprise-api
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mno-enterprise-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.1.3
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,7 @@ files:
 - app/views/mno_enterprise/auth/sessions/_form.html.haml
 - app/views/mno_enterprise/auth/sessions/new.html.haml
 - app/views/mno_enterprise/auth/shared/_links.html.haml
+- app/views/mno_enterprise/auth/unlocks/_form.html.haml
 - app/views/mno_enterprise/auth/unlocks/new.html.haml
 - app/views/mno_enterprise/deletion_requests/show.html.haml
 - app/views/mno_enterprise/jpi/v1/admin/audit_events/_audit_event.json.jbuilder