Jens Pfeifer 7 лет назад
Родитель
Сommit
533b44af8f

+ 0 - 1
.gitlab-ci.yml

@@ -416,7 +416,6 @@ browser:build:
     - core
     - core
   script:
   script:
     - export RAILS_ENV=production
     - export RAILS_ENV=production
-    - rake db:drop;
     - rake db:create
     - rake db:create
     - rake db:migrate
     - rake db:migrate
     - rake assets:precompile
     - rake assets:precompile

+ 1 - 1
Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 
 ruby '2.4.1'
 ruby '2.4.1'
 
 
-gem 'rails', '4.2.9'
+gem 'rails', '5.0.5'
 gem 'rails-observers'
 gem 'rails-observers'
 gem 'activerecord-session_store'
 gem 'activerecord-session_store'
 
 

+ 143 - 136
Gemfile.lock

@@ -17,35 +17,38 @@ GIT
 GEM
 GEM
   remote: https://rubygems.org/
   remote: https://rubygems.org/
   specs:
   specs:
-    actionmailer (4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
+    actioncable (5.0.5)
+      actionpack (= 5.0.5)
+      nio4r (>= 1.2, < 3.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.5)
+      actionpack (= 5.0.5)
+      actionview (= 5.0.5)
+      activejob (= 5.0.5)
       mail (~> 2.5, >= 2.5.4)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.9)
-      actionview (= 4.2.9)
-      activesupport (= 4.2.9)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.5)
+      actionview (= 5.0.5)
+      activesupport (= 5.0.5)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.9)
-      activesupport (= 4.2.9)
+    actionview (5.0.5)
+      activesupport (= 5.0.5)
       builder (~> 3.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.9)
-      activesupport (= 4.2.9)
-      globalid (>= 0.3.0)
-    activemodel (4.2.9)
-      activesupport (= 4.2.9)
-      builder (~> 3.1)
-    activerecord (4.2.9)
-      activemodel (= 4.2.9)
-      activesupport (= 4.2.9)
-      arel (~> 6.0)
+    activejob (5.0.5)
+      activesupport (= 5.0.5)
+      globalid (>= 0.3.6)
+    activemodel (5.0.5)
+      activesupport (= 5.0.5)
+    activerecord (5.0.5)
+      activemodel (= 5.0.5)
+      activesupport (= 5.0.5)
+      arel (~> 7.0)
     activerecord-nulldb-adapter (0.3.7)
     activerecord-nulldb-adapter (0.3.7)
       activerecord (>= 2.0.0)
       activerecord (>= 2.0.0)
     activerecord-session_store (1.1.0)
     activerecord-session_store (1.1.0)
@@ -54,44 +57,45 @@ GEM
       multi_json (~> 1.11, >= 1.11.2)
       multi_json (~> 1.11, >= 1.11.2)
       rack (>= 1.5.2, < 3)
       rack (>= 1.5.2, < 3)
       railties (>= 4.0, < 5.2)
       railties (>= 4.0, < 5.2)
-    activesupport (4.2.9)
+    activesupport (5.0.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       i18n (~> 0.7)
       minitest (~> 5.1)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
-    arel (6.0.4)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    arel (7.1.4)
     argon2 (1.1.3)
     argon2 (1.1.3)
       ffi (~> 1.9)
       ffi (~> 1.9)
       ffi-compiler (~> 0.1)
       ffi-compiler (~> 0.1)
     ast (2.3.0)
     ast (2.3.0)
-    autoprefixer-rails (7.1.2.4)
+    autoprefixer-rails (7.1.3)
       execjs
       execjs
     biz (1.7.0)
     biz (1.7.0)
       clavius (~> 1.0)
       clavius (~> 1.0)
       tzinfo
       tzinfo
-    browser (2.2.0)
+    browser (2.5.1)
     buftok (0.2.0)
     buftok (0.2.0)
     builder (3.2.3)
     builder (3.2.3)
-    childprocess (0.5.9)
+    childprocess (0.7.1)
       ffi (~> 1.0, >= 1.0.11)
       ffi (~> 1.0, >= 1.0.11)
-    clavius (1.0.2)
+    clavius (1.0.3)
     clearbit (0.2.7)
     clearbit (0.2.7)
       nestful (~> 1.1.0)
       nestful (~> 1.1.0)
-    coderay (1.1.1)
-    coffee-rails (4.2.1)
+    coderay (1.1.2)
+    coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.2.x)
+      railties (>= 4.0.0)
     coffee-script (2.4.1)
     coffee-script (2.4.1)
       coffee-script-source
       coffee-script-source
       execjs
       execjs
     coffee-script-source (1.12.2)
     coffee-script-source (1.12.2)
-    coffeelint (1.14.0)
+    coffeelint (1.16.0)
       coffee-script
       coffee-script
       execjs
       execjs
       json
       json
-    composite_primary_keys (8.1.6)
-      activerecord (~> 4.2.0)
+    composite_primary_keys (9.0.7)
+      activerecord (~> 5.0.0)
     concurrent-ruby (1.0.5)
     concurrent-ruby (1.0.5)
     coveralls (0.8.21)
     coveralls (0.8.21)
       json (>= 1.8, < 3)
       json (>= 1.8, < 3)
@@ -107,12 +111,12 @@ GEM
     delayed_job_active_record (4.1.2)
     delayed_job_active_record (4.1.2)
       activerecord (>= 3.0, < 5.2)
       activerecord (>= 3.0, < 5.2)
       delayed_job (>= 3.0, < 5)
       delayed_job (>= 3.0, < 5)
-    diff-lcs (1.2.5)
-    diffy (3.1.0)
+    diff-lcs (1.3)
+    diffy (3.2.0)
     docile (1.1.5)
     docile (1.1.5)
     domain_name (0.5.20170404)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (4.2.0)
+    doorkeeper (4.2.6)
       railties (>= 4.2)
       railties (>= 4.2)
     eco (1.0.0)
     eco (1.0.0)
       coffee-script
       coffee-script
@@ -122,18 +126,18 @@ GEM
     em-websocket (0.5.1)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
       http_parser.rb (~> 0.6.0)
-    equalizer (0.0.10)
+    equalizer (0.0.11)
     erubis (2.7.0)
     erubis (2.7.0)
-    eventmachine (1.2.3)
+    eventmachine (1.2.5)
     execjs (2.7.0)
     execjs (2.7.0)
     factory_girl (4.8.0)
     factory_girl (4.8.0)
       activesupport (>= 3.0.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.8.0)
     factory_girl_rails (4.8.0)
       factory_girl (~> 4.8.0)
       factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
       railties (>= 3.0.0)
-    faraday (0.9.2)
+    faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
       multipart-post (>= 1.2, < 3)
-    faraday-http-cache (1.3.1)
+    faraday-http-cache (2.0.0)
       faraday (~> 0.8)
       faraday (~> 0.8)
     ffi (1.9.18)
     ffi (1.9.18)
     ffi-compiler (0.1.3)
     ffi-compiler (0.1.3)
@@ -142,17 +146,17 @@ GEM
     figaro (1.1.1)
     figaro (1.1.1)
       thor (~> 0.14)
       thor (~> 0.14)
     formatador (0.2.5)
     formatador (0.2.5)
-    github_changelog_generator (1.14.1)
+    github_changelog_generator (1.14.3)
       activesupport
       activesupport
       faraday-http-cache
       faraday-http-cache
       multi_json
       multi_json
-      octokit (~> 4.0)
+      octokit (~> 4.6)
       rainbow (>= 2.1)
       rainbow (>= 2.1)
       rake (>= 10.0)
       rake (>= 10.0)
       retriable (~> 2.1)
       retriable (~> 2.1)
     globalid (0.4.0)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
       activesupport (>= 4.2.0)
-    guard (2.14.0)
+    guard (2.14.1)
       formatador (>= 0.2.4)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       listen (>= 2.7, < 4.0)
       lumberjack (~> 1.0)
       lumberjack (~> 1.0)
@@ -170,10 +174,10 @@ GEM
     guard-symlink (0.1.1)
     guard-symlink (0.1.1)
       guard
       guard
       guard-compat (~> 1.1)
       guard-compat (~> 1.1)
-    hashdiff (0.3.5)
+    hashdiff (0.3.6)
     hashie (3.5.6)
     hashie (3.5.6)
     htmlentities (4.3.4)
     htmlentities (4.3.4)
-    http (1.0.4)
+    http (2.2.2)
       addressable (~> 2.3)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-cookie (~> 1.0)
       http-form_data (~> 1.0.1)
       http-form_data (~> 1.0.1)
@@ -190,13 +194,13 @@ GEM
       ice_cube (~> 0.13)
       ice_cube (~> 0.13)
     ice_cube (0.16.2)
     ice_cube (0.16.2)
     inflection (1.0.0)
     inflection (1.0.0)
-    json (1.8.6)
+    json (2.1.0)
     jwt (1.5.6)
     jwt (1.5.6)
     kgio (2.11.0)
     kgio (2.11.0)
-    koala (2.4.0)
+    koala (3.0.0)
       addressable
       addressable
       faraday
       faraday
-      multi_json (>= 1.3.0)
+      json (>= 1.8)
     libv8 (3.16.14.19)
     libv8 (3.16.14.19)
     listen (3.1.5)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -208,41 +212,40 @@ GEM
       multi_json (~> 1.10)
       multi_json (~> 1.10)
     loofah (2.0.3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
       nokogiri (>= 1.5.9)
-    lumberjack (1.0.10)
+    lumberjack (1.0.12)
     mail (2.6.6)
     mail (2.6.6)
       mime-types (>= 1.16, < 4)
       mime-types (>= 1.16, < 4)
     memoizable (0.4.2)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.8.2)
     method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types (2.99.3)
     mini_portile2 (2.2.0)
     mini_portile2 (2.2.0)
     minitest (5.10.3)
     minitest (5.10.3)
     multi_json (1.12.1)
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     multipart-post (2.0.0)
-    mysql2 (0.4.6)
+    mysql2 (0.4.9)
     naught (1.1.0)
     naught (1.1.0)
     nenv (0.3.0)
     nenv (0.3.0)
     nestful (1.1.1)
     nestful (1.1.1)
-    net-ldap (0.15.0)
+    net-ldap (0.16.0)
     netrc (0.11.0)
     netrc (0.11.0)
+    nio4r (2.1.0)
     nokogiri (1.8.0)
     nokogiri (1.8.0)
       mini_portile2 (~> 2.2.0)
       mini_portile2 (~> 2.2.0)
     nori (2.6.0)
     nori (2.6.0)
     notiffany (0.1.1)
     notiffany (0.1.1)
       nenv (~> 0.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
       shellany (~> 0.0)
-    oauth (0.5.1)
+    oauth (0.5.3)
     oauth2 (1.4.0)
     oauth2 (1.4.0)
       faraday (>= 0.8, < 0.13)
       faraday (>= 0.8, < 0.13)
       jwt (~> 1.0)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
       rack (>= 1.2, < 3)
-    octokit (4.4.1)
-      sawyer (~> 0.7.0, >= 0.5.3)
+    octokit (4.7.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
     omniauth (1.6.1)
     omniauth (1.6.1)
       hashie (>= 3.4.6, < 3.6.0)
       hashie (>= 3.4.6, < 3.6.0)
       rack (>= 1.6.2, < 3)
       rack (>= 1.6.2, < 3)
@@ -254,12 +257,12 @@ GEM
     omniauth-gitlab (1.0.2)
     omniauth-gitlab (1.0.2)
       omniauth (~> 1.0)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.0)
       omniauth-oauth2 (~> 1.0)
-    omniauth-google-oauth2 (0.5.0)
+    omniauth-google-oauth2 (0.5.2)
       jwt (~> 1.5)
       jwt (~> 1.5)
       multi_json (~> 1.3)
       multi_json (~> 1.3)
       omniauth (>= 1.1.1)
       omniauth (>= 1.1.1)
       omniauth-oauth2 (>= 1.3.1)
       omniauth-oauth2 (>= 1.3.1)
-    omniauth-linkedin-oauth2 (0.1.5)
+    omniauth-linkedin-oauth2 (0.2.5)
       omniauth (~> 1.0)
       omniauth (~> 1.0)
       omniauth-oauth2
       omniauth-oauth2
     omniauth-microsoft-office365 (0.0.7)
     omniauth-microsoft-office365 (0.0.7)
@@ -271,14 +274,14 @@ GEM
     omniauth-oauth2 (1.4.0)
     omniauth-oauth2 (1.4.0)
       oauth2 (~> 1.0)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
       omniauth (~> 1.2)
-    omniauth-twitter (1.2.1)
-      json (~> 1.3)
+    omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       omniauth-oauth (~> 1.1)
-    parser (2.3.1.2)
+      rack
+    parser (2.4.0.0)
       ast (~> 2.2)
       ast (~> 2.2)
     pg (0.20.0)
     pg (0.20.0)
     pluginator (1.5.0)
     pluginator (1.5.0)
-    power_assert (0.3.1)
+    power_assert (1.1.0)
     powerpack (0.1.1)
     powerpack (0.1.1)
     pre-commit (0.35.0)
     pre-commit (0.35.0)
       pluginator (~> 1.5)
       pluginator (~> 1.5)
@@ -286,68 +289,68 @@ GEM
       coderay (~> 1.1.0)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       method_source (~> 0.8.1)
       slop (~> 3.4)
       slop (~> 3.4)
-    puma (3.9.1)
-    rack (1.6.8)
+    public_suffix (3.0.0)
+    puma (3.10.0)
+    rack (2.0.3)
     rack-livereload (0.3.16)
     rack-livereload (0.3.16)
       rack
       rack
     rack-test (0.6.3)
     rack-test (0.6.3)
       rack (>= 1.0)
       rack (>= 1.0)
-    rails (4.2.9)
-      actionmailer (= 4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
-      activemodel (= 4.2.9)
-      activerecord (= 4.2.9)
-      activesupport (= 4.2.9)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.9)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
+    rails (5.0.5)
+      actioncable (= 5.0.5)
+      actionmailer (= 5.0.5)
+      actionpack (= 5.0.5)
+      actionview (= 5.0.5)
+      activejob (= 5.0.5)
+      activemodel (= 5.0.5)
+      activerecord (= 5.0.5)
+      activesupport (= 5.0.5)
+      bundler (>= 1.3.0)
+      railties (= 5.0.5)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
       loofah (~> 2.0)
     rails-observers (0.1.5)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
       activemodel (>= 4.0)
-    railties (4.2.9)
-      actionpack (= 4.2.9)
-      activesupport (= 4.2.9)
+    railties (5.0.5)
+      actionpack (= 5.0.5)
+      activesupport (= 5.0.5)
+      method_source
       rake (>= 0.8.7)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
     rainbow (2.2.2)
       rake
       rake
     raindrops (0.19.0)
     raindrops (0.19.0)
     rake (12.0.0)
     rake (12.0.0)
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
     ref (2.0.0)
     ref (2.0.0)
-    rest-client (2.0.0)
+    rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     retriable (2.1.0)
     retriable (2.1.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.1)
       actionpack (>= 3.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     rubocop (0.42.0)
     rubocop (0.42.0)
       parser (>= 2.3.1.1, < 3.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       powerpack (~> 0.1)
@@ -355,23 +358,26 @@ GEM
       ruby-progressbar (~> 1.7)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
     ruby-progressbar (1.8.1)
-    ruby_dep (1.4.0)
+    ruby_dep (1.5.0)
     rubyzip (1.2.1)
     rubyzip (1.2.1)
     safe_yaml (1.0.4)
     safe_yaml (1.0.4)
-    sass (3.4.22)
+    sass (3.5.1)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     sass-rails (5.0.6)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
       tilt (>= 1.1, < 3)
-    sawyer (0.7.0)
-      addressable (>= 2.3.5, < 2.5)
-      faraday (~> 0.8, < 0.10)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
     selenium-webdriver (2.53.4)
     selenium-webdriver (2.53.4)
       childprocess (~> 0.5)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
       rubyzip (~> 1.0)
-      websocket (~> 1.0)
     shellany (0.0.1)
     shellany (0.0.1)
     simple-rss (1.3.1)
     simple-rss (1.3.1)
     simple_oauth (0.3.1)
     simple_oauth (0.3.1)
@@ -379,10 +385,10 @@ GEM
       docile (~> 1.1.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     simplecov-rcov (0.2.3)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
       simplecov (>= 0.4.1)
-    slack-notifier (1.5.1)
+    slack-notifier (2.3.1)
     slop (3.6.0)
     slop (3.6.0)
     spring (2.0.2)
     spring (2.0.2)
       activesupport (>= 4.2)
       activesupport (>= 4.2)
@@ -391,47 +397,46 @@ GEM
     sprockets (3.7.1)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.11)
+    sqlite3 (1.3.13)
     telegramAPI (1.2.2)
     telegramAPI (1.2.2)
-      rest-client (~> 2.0, >= 1.7.3)
+      rest-client (~> 1.7, >= 1.7.3)
     term-ansicolor (1.6.0)
     term-ansicolor (1.6.0)
       tins (~> 1.0)
       tins (~> 1.0)
-    test-unit (3.2.1)
+    test-unit (3.2.5)
       power_assert
       power_assert
     therubyracer (0.12.3)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       libv8 (~> 3.16.14.15)
       ref
       ref
     thor (0.19.4)
     thor (0.19.4)
     thread_safe (0.3.6)
     thread_safe (0.3.6)
-    tilt (2.0.5)
+    tilt (2.0.8)
     tins (1.15.0)
     tins (1.15.0)
-    twitter (5.17.0)
-      addressable (~> 2.3)
+    twitter (6.1.0)
+      addressable (~> 2.5)
       buftok (~> 0.2.0)
       buftok (~> 0.2.0)
-      equalizer (= 0.0.10)
-      faraday (~> 0.9.0)
-      http (~> 1.0)
+      equalizer (= 0.0.11)
+      faraday (~> 0.11.0)
+      http (~> 2.1)
       http_parser.rb (~> 0.6.0)
       http_parser.rb (~> 0.6.0)
-      json (~> 1.8)
-      memoizable (~> 0.4.0)
-      naught (~> 1.0)
-      simple_oauth (~> 0.3.0)
+      memoizable (~> 0.4.2)
+      naught (~> 1.1)
+      simple_oauth (~> 0.3.1)
     tzinfo (1.2.3)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
       thread_safe (~> 0.1)
-    uglifier (3.0.2)
+    uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
     unf (0.1.4)
       unf_ext
       unf_ext
     unf_ext (0.0.7.4)
     unf_ext (0.0.7.4)
-    unicode-display_width (1.1.1)
+    unicode-display_width (1.3.0)
     unicorn (5.3.0)
     unicorn (5.3.0)
       kgio (~> 2.6)
       kgio (~> 2.6)
       raindrops (~> 0.7)
       raindrops (~> 0.7)
-    valid_email2 (2.0.0)
+    valid_email2 (2.0.1)
       activemodel (>= 3.2)
       activemodel (>= 3.2)
       mail (~> 2.5)
       mail (~> 2.5)
     viewpoint (1.1.0)
     viewpoint (1.1.0)
@@ -443,7 +448,9 @@ GEM
       addressable (>= 2.3.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       crack (>= 0.3.2)
       hashdiff
       hashdiff
-    websocket (1.2.3)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
     writeexcel (1.0.5)
     writeexcel (1.0.5)
     zendesk_api (1.14.4)
     zendesk_api (1.14.4)
       faraday (~> 0.9)
       faraday (~> 0.9)
@@ -507,7 +514,7 @@ DEPENDENCIES
   pre-commit
   pre-commit
   puma
   puma
   rack-livereload
   rack-livereload
-  rails (= 4.2.9)
+  rails (= 5.0.5)
   rails-observers
   rails-observers
   rb-fsevent
   rb-fsevent
   rspec-rails
   rspec-rails
@@ -539,4 +546,4 @@ RUBY VERSION
    ruby 2.4.1p111
    ruby 2.4.1p111
 
 
 BUNDLED WITH
 BUNDLED WITH
-   1.15.3
+   1.15.4

+ 0 - 4
app/controllers/application_controller/authenticates.rb

@@ -1,10 +1,6 @@
 module ApplicationController::Authenticates
 module ApplicationController::Authenticates
   extend ActiveSupport::Concern
   extend ActiveSupport::Concern
 
 
-  included do
-    skip_before_action :verify_authenticity_token
-  end
-
   private
   private
 
 
   def response_access_deny
   def response_access_deny

+ 1 - 1
app/controllers/applications_controller.rb

@@ -58,7 +58,7 @@ class ApplicationsController < ApplicationController
   private
   private
 
 
   def clean_params
   def clean_params
-    params_data = params.permit! #.to_h
+    params_data = params.permit!.to_h
     params_data.delete('application')
     params_data.delete('application')
     params_data.delete('action')
     params_data.delete('action')
     params_data.delete('controller')
     params_data.delete('controller')

+ 4 - 4
app/controllers/concerns/creates_ticket_articles.rb

@@ -13,10 +13,10 @@ module CreatesTicketArticles
     raise Exceptions::UnprocessableEntity, 'Need at least article: { body: "some text" }' if !params[:body]
     raise Exceptions::UnprocessableEntity, 'Need at least article: { body: "some text" }' if !params[:body]
 
 
     # fill default values
     # fill default values
-    if params[:type_id].empty? && params[:type].empty?
+    if params[:type_id].blank? && params[:type].blank?
       params[:type_id] = Ticket::Article::Type.lookup(name: 'note').id
       params[:type_id] = Ticket::Article::Type.lookup(name: 'note').id
     end
     end
-    if params[:sender_id].empty? && params[:sender].empty?
+    if params[:sender_id].blank? && params[:sender].blank?
       sender = 'Customer'
       sender = 'Customer'
       if current_user.permissions?('ticket.agent')
       if current_user.permissions?('ticket.agent')
         sender = 'Agent'
         sender = 'Agent'
@@ -73,7 +73,7 @@ module CreatesTicketArticles
     }
     }
 
 
     # add attachments as param
     # add attachments as param
-    if params[:attachments]
+    if params[:attachments].present?
       params[:attachments].each_with_index { |attachment, index|
       params[:attachments].each_with_index { |attachment, index|
 
 
         # validation
         # validation
@@ -112,7 +112,7 @@ module CreatesTicketArticles
       )
       )
     end
     end
 
 
-    return article if !form_id
+    return article if form_id.blank?
 
 
     # remove attachments from upload cache
     # remove attachments from upload cache
     Store.remove(
     Store.remove(

+ 6 - 6
app/controllers/integration/sipgate_controller.rb

@@ -9,7 +9,7 @@ class Integration::SipgateController < ApplicationController
   # notify about inbound call / block inbound call
   # notify about inbound call / block inbound call
   def in
   def in
     if params['event'] == 'newCall'
     if params['event'] == 'newCall'
-      config_inbound = config[:inbound] || {}
+      config_inbound = config_integration[:inbound] || {}
       block_caller_ids = config_inbound[:block_caller_ids] || []
       block_caller_ids = config_inbound[:block_caller_ids] || []
 
 
       # check if call need to be blocked
       # check if call need to be blocked
@@ -43,8 +43,8 @@ class Integration::SipgateController < ApplicationController
 
 
   # set caller id of outbound call
   # set caller id of outbound call
   def out
   def out
-    config_outbound = config[:outbound][:routing_table]
-    default_caller_id = config[:outbound][:default_caller_id]
+    config_outbound = config_integration[:outbound][:routing_table]
+    default_caller_id = config_integration[:outbound][:default_caller_id]
 
 
     xml = Builder::XmlMarkup.new(indent: 2)
     xml = Builder::XmlMarkup.new(indent: 2)
     xml.instruct!
     xml.instruct!
@@ -89,14 +89,14 @@ class Integration::SipgateController < ApplicationController
       xml_error('Feature is disable, please contact your admin to enable it!')
       xml_error('Feature is disable, please contact your admin to enable it!')
       return
       return
     end
     end
-    if !config || !config[:inbound] || !config[:outbound]
+    if !config_integration || !config_integration[:inbound] || !config_integration[:outbound]
       xml_error('Feature not configured, please contact your admin!')
       xml_error('Feature not configured, please contact your admin!')
       return
       return
     end
     end
   end
   end
 
 
-  def config
-    @config ||= Setting.get('sipgate_config')
+  def config_integration
+    @config_integration ||= Setting.get('sipgate_config')
   end
   end
 
 
   def xml_error(error)
   def xml_error(error)

+ 17 - 14
app/controllers/object_manager_attributes_controller.rb

@@ -31,15 +31,16 @@ class ObjectManagerAttributesController < ApplicationController
     )
     )
     raise Exceptions::UnprocessableEntity, 'already exists' if exists
     raise Exceptions::UnprocessableEntity, 'already exists' if exists
 
 
+    local_params = params.permit!.to_h
     begin
     begin
       object_manager_attribute = ObjectManager::Attribute.add(
       object_manager_attribute = ObjectManager::Attribute.add(
-        object: params[:object],
-        name: params[:name],
-        display: params[:display],
-        data_type: params[:data_type],
-        data_option: params[:data_option],
-        active: params[:active],
-        screens: params[:screens],
+        object: local_params[:object],
+        name: local_params[:name],
+        display: local_params[:display],
+        data_type: local_params[:data_type],
+        data_option: local_params[:data_option],
+        active: local_params[:active],
+        screens: local_params[:screens],
         position: 1550,
         position: 1550,
         editable: true,
         editable: true,
       )
       )
@@ -52,15 +53,17 @@ class ObjectManagerAttributesController < ApplicationController
   # PUT /object_manager_attributes/1
   # PUT /object_manager_attributes/1
   def update
   def update
     check_params
     check_params
+
+    local_params = params.permit!.to_h
     begin
     begin
       object_manager_attribute = ObjectManager::Attribute.add(
       object_manager_attribute = ObjectManager::Attribute.add(
-        object: params[:object],
-        name: params[:name],
-        display: params[:display],
-        data_type: params[:data_type],
-        data_option: params[:data_option],
-        active: params[:active],
-        screens: params[:screens],
+        object: local_params[:object],
+        name: local_params[:name],
+        display: local_params[:display],
+        data_type: local_params[:data_type],
+        data_option: local_params[:data_option],
+        active: local_params[:active],
+        screens: local_params[:screens],
         position: 1550,
         position: 1550,
         editable: true,
         editable: true,
       )
       )

+ 1 - 1
app/controllers/organizations_controller.rb

@@ -252,7 +252,7 @@ curl http://localhost/api/v1/organization/{id} -v -u #{login}:#{password} -H "Co
     # do pagination if needed
     # do pagination if needed
     if params[:page] && params[:per_page]
     if params[:page] && params[:per_page]
       offset = (params[:page].to_i - 1) * params[:per_page].to_i
       offset = (params[:page].to_i - 1) * params[:per_page].to_i
-      organization_all = organization_all.slice(offset, params[:per_page].to_i) || []
+      organization_all = organization_all[offset, params[:per_page].to_i] || []
     end
     end
 
 
     if params[:expand]
     if params[:expand]

+ 1 - 1
app/controllers/sessions_controller.rb

@@ -24,7 +24,7 @@ class SessionsController < ApplicationController
     if params[:remember_me]
     if params[:remember_me]
       expire_after = 1.year
       expire_after = 1.year
     end
     end
-    env['rack.session.options'][:expire_after] = expire_after
+    request.env['rack.session.options'][:expire_after] = expire_after
 
 
     # set session user
     # set session user
     current_user_set(user)
     current_user_set(user)

Некоторые файлы не были показаны из-за большого количества измененных файлов