make travis green again

config/application.rb

@@ -30,6 +30,8 @@ module CodeOcean
 
     config.autoload_paths << Rails.root.join('lib')
     config.eager_load_paths << Rails.root.join('lib')
+    config.assets.precompile += %w( markdown-buttons.png )
+
     case (RUBY_ENGINE)
       when 'ruby'
         # ...

config/deploy/staging.rb

@@ -0,0 +1,3 @@
+server '10.210.0.50', roles: [:app, :db, :puma_nginx, :web], user: 'debian'
+set :rails_env, "staging"
+set :branch, ENV['BRANCH'] if ENV['BRANCH']

config/docker.yml.erb

@@ -34,6 +34,20 @@ production:
   ws_host: ws://localhost:4243 #url to connect rails server to docker host
   ws_client_protocol: wss:// #set the websocket protocol to be used by the client to connect to the rails server (ws on development, wss on production)
 
+staging:
+  <<: *default
+  host: unix:///var/run/docker.sock
+  pool:
+    active: true
+    refill:
+      async: false
+      batch_size: 8
+      interval: 15
+      timeout: 60
+  workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %>
+  ws_host: ws://localhost:4243 #url to connect rails server to docker host
+  ws_client_protocol: wss:// #set the websocket protocol to be used by the client to connect to the rails server (ws on development, wss on production)
+
 test:
   <<: *default
   host: tcp://192.168.59.104:2376

config/environments/staging.rb

@@ -0,0 +1,87 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # Code is not reloaded between requests.
+  config.cache_classes = true
+
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # config.action_dispatch.rack_cache = true
+
+  # Disable Rails's static asset server (Apache or nginx will already do this).
+  config.serve_static_assets = false
+
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
+
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = false
+
+  # Generate digests for assets URLs.
+  config.assets.digest = true
+
+  # Version of your assets, change this if you want to expire all your assets.
+  config.assets.version = '1.0'
+
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # Set to :debug to see everything in the log.
+  config.log_level = :error
+
+  # Prepend all log lines with the following tags.
+  # config.log_tags = [ :subdomain, :uuid ]
+
+  # Use a different logger for distributed setups.
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+
+  # Use a different cache store in production.
+  # config.cache_store = :mem_cache_store
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Precompile additional assets.
+  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+  # config.assets.precompile += %w( search.js )
+
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation cannot be found).
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners.
+  config.active_support.deprecation = :notify
+
+  # Disable automatic flushing of the log to improve performance.
+  # config.autoflush_log = false
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
+
+  # Run on subfolder in production environment.
+  config.relative_url_root = '/co-staging'
+
+end

config/locales/de.yml

@@ -246,7 +246,7 @@ de:
       comment:
         a_comment: Kommentar
         line: Zeile
-        dialogtitle: Kommentieren Sie diese Zeile!
+        dialogtitle: Kommentar hinzufügen
         others: Andere Kommentare auf dieser Zeile
         addyours: Fügen Sie Ihren Kommentar hinzu
         addComment: Kommentieren
@@ -273,6 +273,7 @@ de:
       external_user: Externe Nutzer
     submit:
       failure: Beim Übermitteln Ihrer Punktzahl ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut.
+      full_score_redirect_to_rfc: Herzlichen Glückwunsch! Sie haben die maximale Punktzahl für diese Aufgabe an den Kurs übertragen. Ein anderer Teilnehmer hat eine Frage zu der von Ihnen gelösten Aufgabe. Er würde sich sicherlich sehr über ihre Hilfe und Kommentare freuen.
     external_users:
       statistics:
         no_data_available: Keine Daten verfügbar.

config/locales/en.yml

@@ -246,7 +246,7 @@ en:
       comment:
         a_comment: comment
         line: line
-        dialogtitle: Comment on this line!
+        dialogtitle: Comment on this line
         others: Other comments on this line
         addyours: Add your comment
         addComment: Comment this
@@ -273,6 +273,7 @@ en:
       external_users: External Users
     submit:
       failure: An error occured while transmitting your score. Please try again later.
+      full_score_redirect_to_rfc: Congratulations! You achieved and submitted the highest possible score for this exercise. Another participant has a question concerning the exercise you just solved. Your help and comments will be greatly appreciated!
     external_users:
       statistics:
         no_data_available: No data available.

config/nginx.conf

@@ -1,45 +0,0 @@
-upstream puma {
-  server unix:///var/www/app/shared/tmp/sockets/puma.sock;
-}
-
-server {
-  listen 80 default deferred;
-  return 301 https://codeocean.openhpi.de$request_uri;
-  server_name codeocean.openhpi.de;
-}
-
-server {
-  client_max_body_size 4G;
-  error_page 500 502 503 504 /500.html;
-  keepalive_timeout 10;
-  listen 443 ssl;
-  root /var/www/app/current/public;
-  server_name codeocean.openhpi.de;
-  try_files $uri @puma;
-
-  ssl_certificate /etc/nginx/ssl/ssl-bundle.crt;
-  ssl_certificate_key /etc/nginx/ssl/server.key;
-  ssl_ciphers HIGH:!ADH:!EXPORT56:RC4+RSA:+MEDIUM;
-  ssl_prefer_server_ciphers on;
-  ssl_protocols SSLv3 TLSv1;
-  ssl_session_timeout 5m;
-
-  location / {
-    access_log /var/www/app/current/log/nginx.access.log;
-    error_log /var/www/app/current/log/nginx.error.log;
-    proxy_http_version 1.1;
-    proxy_pass http://puma;
-    proxy_read_timeout 900;
-    proxy_redirect off;
-    proxy_set_header Connection '';
-    proxy_set_header Host $http_host;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto $scheme;
-  }
-
-  location ^~ /assets/ {
-    add_header Cache-Control public;
-    expires max;
-    gzip_static on;
-  }
-}