Merge branch 'develop' into private-pull-request-1118

.gitlab-ci.yml

@@ -3,7 +3,7 @@ before_script:
   - which ruby
   - env
   - test -n "$RNAME" && script/build/test_db_config.sh
-  - test -n "$RNAME" && bundle install
+  - test -n "$RNAME" && bundle install --jobs 8
 
 stages:
   - pre
@@ -127,6 +127,17 @@ test:integration:email_deliver:
     - ruby -I test/ test/integration/email_deliver_test.rb
     - rake db:drop
 
+test:integration:email_keep_on_server:
+  stage: test
+  tags:
+    - core
+  script:
+    - export RAILS_ENV=test
+    - rake db:create
+    - rake db:migrate
+    - ruby -I test/ test/integration/email_keep_on_server_test.rb
+    - rake db:drop
+
 test:integration:twitter:
   stage: test
   tags:
@@ -229,7 +240,7 @@ test:integration:slack:
     - rake db:create
     - rake db:migrate
     - echo "gem 'slack-api'" >> Gemfile.local
-    - bundle install
+    - bundle install --jobs 8
     - ruby -I test test/integration/slack_test.rb
     - rake db:drop
 
@@ -281,6 +292,7 @@ test:integration:es_mysql:
     - ruby -I test/ test/integration/elasticsearch_test.rb
     - ruby -I test/ test/controllers/search_controller_test.rb
     - ruby -I test/ test/integration/report_test.rb
+    - ruby -I test/ test/controllers/form_controller_test.rb
     - rake db:drop
 
 test:integration:es_postgresql:
@@ -297,6 +309,7 @@ test:integration:es_postgresql:
     - ruby -I test/ test/integration/elasticsearch_test.rb
     - ruby -I test/ test/controllers/search_controller_test.rb
     - ruby -I test/ test/integration/report_test.rb
+    - ruby -I test/ test/controllers/form_controller_test.rb
     - rake db:drop
 
 test:integration:zendesk_mysql:
@@ -330,7 +343,7 @@ test:integration:otrs_5_mysql:
     - mysql
   script:
     - export RAILS_ENV=test
-    - export IMPORT_OTRS_ENDPOINT="http://vz599.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator"
+    - export IMPORT_OTRS_ENDPOINT="http://vz1109.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator"
     - rake db:create
     - rake db:migrate
     - ruby -I test/ test/integration/otrs_import_test.rb
@@ -343,7 +356,7 @@ test:integration:otrs_5_postgresql:
     - postgresql
   script:
     - export RAILS_ENV=test
-    - export IMPORT_OTRS_ENDPOINT="http://vz599.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator"
+    - export IMPORT_OTRS_ENDPOINT="http://vz1109.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator"
     - rake db:create
     - rake db:migrate
     - ruby -I test/ test/integration/otrs_import_test.rb
@@ -409,6 +422,7 @@ browser:build:
     - rake assets:precompile
     - rake db:drop
   artifacts:
+    expire_in: 1 week
     paths:
     - public/assets/.sprockets-manifest*
     - public/assets/application-*
@@ -426,7 +440,7 @@ test:browser:integration:api_client_ruby:
     - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
     - git clone [email protected]:zammad/zammad-api-client-ruby.git || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
     - cd zammad-api-client-ruby
-    - bundle install
+    - bundle install --jobs 8
     - export TEST_URL=http://$IP:$BROWSER_PORT
     - rspec || (cd .. && script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1)
     - cd .. && script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1

.pkgr.yml

@@ -5,19 +5,23 @@ notifications: false
 targets:
   centos-7:
     dependencies:
+      - elasticsearch
       - nginx
       - postgresql-server
       - which
   debian-8:
     dependencies:
+      - elasticsearch
       - nginx|apache2
       - postgresql|mysql-server|mariadb-server|sqlite
   ubuntu-16.04:
     dependencies:
+      - elasticsearch
       - nginx|apache2
       - postgresql|mysql-server|mariadb-server|sqlite
   sles-12:
     dependencies:
+      - elasticsearch
       - nginx
       - postgresql-server
 before:

.ruby-version

@@ -1 +1 @@
-2.3.1
+2.4.1

.travis.yml

@@ -19,7 +19,7 @@ services:
   - mysql
 language: ruby
 rvm:
-  - 2.3.1
+  - 2.4.1
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev postfix
@@ -55,3 +55,4 @@ script:
   - ruby -I test/ test/integration/user_device_controller_test.rb
   - ruby -I test/ test/integration/sipgate_controller_test.rb
   - rake db:drop
+after_success: contrib/travis-ci.org/trigger-docker-compose-build.sh

CHANGELOG.md

@@ -1,7 +1,7 @@
 # Change Log
 
-## [1.6.0](https://github.com/zammad/zammad/tree/1.6.0) (2017-xx-xx)
-[Full Changelog](https://github.com/zammad/zammad/compare/1.4.0...1.5.0)
+## [2.1.0](https://github.com/zammad/zammad/tree/2.1.0) (2017-xx-xx)
+[Full Changelog](https://github.com/zammad/zammad/compare/2.0.0...2.1.0)
 
 **Implemented enhancements:**
 

Gemfile

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-ruby '2.3.1'
+ruby '2.4.1'
 
-gem 'rails', '4.2.7.1'
+gem 'rails', '4.2.9'
 gem 'rails-observers'
 gem 'activerecord-session_store'
 
@@ -40,18 +40,20 @@ gem 'omniauth-gitlab'
 gem 'omniauth-google-oauth2'
 gem 'omniauth-linkedin-oauth2'
 gem 'omniauth-twitter'
+gem 'omniauth-microsoft-office365'
 
 gem 'twitter'
 gem 'telegramAPI'
 gem 'koala'
 gem 'mail'
-gem 'email_verifier'
+gem 'valid_email2'
 gem 'htmlentities'
 
 gem 'mime-types'
 
 gem 'biz'
 
+gem 'composite_primary_keys'
 gem 'delayed_job_active_record'
 gem 'daemons'
 
@@ -72,12 +74,16 @@ gem 'argon2'
 
 gem 'writeexcel'
 gem 'icalendar'
+gem 'icalendar-recurrence'
 gem 'browser'
 
 # integrations
 gem 'slack-notifier'
 gem 'clearbit'
 gem 'zendesk_api'
+gem 'viewpoint'
+gem 'rubyntlm', git: 'https://github.com/wimm/rubyntlm.git'
+gem 'autodiscover', git: 'https://github.com/thorsteneckel/autodiscover.git'
 
 # event machine
 gem 'eventmachine'