diff --git a/Gemfile b/Gemfile index 6ccc952..cabb261 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ # ------------------------------------------------ # DATABASE/SERVER gem 'pg' -gem 'mysql2', '~> 0.3.18' +#gem 'mysql2', '~> 0.3.18' # ------------------------------------------------ # JS <-> RUBY BRIDGE diff --git a/Gemfile.lock b/Gemfile.lock index d2532a9..d3f1394 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -211,7 +211,6 @@ ruby-progressbar multi_json (1.12.1) multipart-post (2.0.0) - mysql2 (0.3.21) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) @@ -351,7 +350,6 @@ libv8 minitest-rails-capybara minitest-reporters - mysql2 (~> 0.3.18) omniauth omniauth-shibboleth pg @@ -382,4 +380,4 @@ ruby 2.2.2p95 BUNDLED WITH - 1.13.2 + 1.13.7 diff --git a/config/branding.yml b/config/branding.yml deleted file mode 120000 index 86cd084..0000000 --- a/config/branding.yml +++ /dev/null @@ -1 +0,0 @@ -/opt/src/roadmap-branding/dmponline/config/locales/static_pages/branding.yml \ No newline at end of file diff --git a/config/branding.yml b/config/branding.yml new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/config/branding.yml