This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Library/Formula/qt5.rb b/Library/Formula/qt5.rb | |
index ff54df3..62010ae 100644 | |
--- a/Library/Formula/qt5.rb | |
+++ b/Library/Formula/qt5.rb | |
@@ -14,7 +14,7 @@ end | |
class Qt5 < Formula | |
desc "Version 5 of the Qt framework" | |
homepage "https://www.qt.io/" | |
- head "https://code.qt.io/qt/qt5.git", :branch => "5.5", :shallow => false | |
+ head "https://code.qt.io/qt/qt5.git", :branch => "dev", :shallow => false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/db/schema.rb b/db/schema.rb | |
index 04a80c4..8a9dd68 100644 | |
--- a/db/schema.rb | |
+++ b/db/schema.rb | |
@@ -170,9 +170,9 @@ ActiveRecord::Schema.define(version: 20140203154258) do | |
t.text "entry_requirements" | |
t.integer "application_option_id" | |
t.text "funding" | |
- t.string "institution_code", limit: 4 | |
t.string "kis_course_id" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/db/schema.rb b/db/schema.rb | |
index f53a0c5..cea3501 100644 | |
--- a/db/schema.rb | |
+++ b/db/schema.rb | |
@@ -11,7 +11,7 @@ | |
# | |
# It's strongly recommended that you check this file into your version control system. | |
-ActiveRecord::Schema.define(version: 20140214121756) do | |
+ActiveRecord::Schema.define(version: 20140214124147) do |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/db/schema.rb b/db/schema.rb | |
index 335bfa2..267d4d2 100644 | |
--- a/db/schema.rb | |
+++ b/db/schema.rb | |
@@ -11,7 +11,7 @@ | |
# | |
# It's strongly recommended that you check this file into your version control system. | |
-ActiveRecord::Schema.define(version: 20140225133701) do | |
+ActiveRecord::Schema.define(version: 20140224133936) do |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/config/environments/staging.rb b/config/environments/staging.rb | |
index 7c2a1ac..89bb900 100644 | |
--- a/config/environments/staging.rb | |
+++ b/config/environments/staging.rb | |
@@ -1,33 +1,69 @@ | |
PlymouthGain::Application.configure do | |
# Settings specified here will take precedence over those in config/application.rb. | |
- # The test environment is used exclusively to run your application's | |
- # test suite. You never need to work with it otherwise. Remember that |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/config/environments/staging.rb b/config/environments/staging.rb | |
index 7c2a1ac..89bb900 100644 | |
--- a/config/environments/staging.rb | |
+++ b/config/environments/staging.rb | |
@@ -1,33 +1,69 @@ | |
PlymouthGain::Application.configure do | |
# Settings specified here will take precedence over those in config/application.rb. | |
- # The test environment is used exclusively to run your application's | |
- # test suite. You never need to work with it otherwise. Remember that |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[ 2014-05-11 06:26:56.3835 24960/7ffc1af1c720 agents/Watchdog/Main.cpp:459 ]: Options: { 'analytics_log_user' => 'nobody', 'default_group' => 'nogroup', 'default_python' => 'python', 'default_ruby' => 'ruby', 'default_user' => 'nobody', 'log_level' => '0', 'max_instances_per_app' => '0', 'max_pool_size' => '6', 'passenger_root' => '/usr/local/rbenv/versions/2.0.0-p353/lib/ruby/gems/2.0.0/gems/passenger-4.0.14', 'pool_idle_time' => '300', 'temp_dir' => '/tmp', 'union_station_gateway_address' => 'gateway.unionstationapp.com', 'union_station_gateway_port' => '443', 'user_switching' => 'true', 'web_server_pid' => '13890', 'web_server_type' => 'apache', 'web_server_worker_gid' => '33', 'web_server_worker_uid' => '33' } | |
[ 2014-05-11 06:26:56.3909 24965/7fd415305720 agents/HelperAgent/Main.cpp:602 ]: PassengerHelperAgent online, listening at unix:/tmp/passenger.1.0.13890/generation-3/request | |
[ 2014-05-11 06:26:56.3996 24970/7fab2f25b740 agents/LoggingAgent/Main.cpp:334 ]: PassengerLoggingAgent online, listening at u |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
➜ apache2 ssh plymouth-gain-production | |
Linux unboxab19.miniserver.com 3.4.62-x1-64 #1 SMP Mon Sep 16 14:09:37 GMT 2013 x86_64 | |
The programs included with the Debian GNU/Linux system are free software; | |
the exact distribution terms for each program are described in the | |
individual files in /usr/share/doc/*/copyright. | |
Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent | |
permitted by applicable law. | |
Last login: Tue May 13 10:13:13 2014 from catv-80-99-186-39.catv.broadband.hu |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
➜ ember-client (1145-fix-cookie-auth) brew install node | |
==> Downloading http://nodejs.org/dist/v0.10.32/node-v0.10.32.tar.gz | |
Already downloaded: /Library/Caches/Homebrew/node-0.10.32.tar.gz | |
==> ./configure --prefix=/usr/local/Cellar/node/0.10.32 --without-npm | |
==> make install | |
==> Downloading https://registry.npmjs.org/npm/-/npm-1.4.24.tgz | |
Already downloaded: /Library/Caches/Homebrew/node--npm-1.4.24.tgz | |
==> make install | |
==> /usr/local/bin/npm install --global npm@latest --prefix /usr/local | |
🍺 /usr/local/Cellar/node/0.10.32: 1678 files, 19M, built in 2.2 minutes |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/sh | |
### BEGIN INIT INFO | |
# Provides: mpd-autoplay | |
# Required-Start: mpd | |
# Required-Stop: | |
# Should-Start: | |
# Should-Stop: | |
# Default-Start: 2 3 4 5 | |
# Default-Stop: 0 1 6 |
OlderNewer