Merge branch 'upgrade_irkeninvader.net' into irkeninvader.net

* upgrade_irkeninvader.net: (570 commits)
  [v2.3.rc1] add postgresql & bundle install
  [v2.3.rc1] add vendor/bundle to .gitignore
  Version 2.3.rc1
  Add pessimistic version constraints for all gems
  Use badges targeting 2.3_branch
  Fix links on same line
  Specify pages for MkDocs
  Minor changelog polish
  Convert changelog to Markdown
  Recommend upgrading from 2.2.3
  Pull changelog entry from Tracks 2.2.3
  Remove metadata from top of changelog
  Update rspec-expectations gem
  Update capybara gem
  Update codeclimate-test-reporter gem
  Use latest Tolk from Rubygems
  fix TracksApp#1400 where deleting a user will clean up tags and dependencies too
  add test for deleting all stuff of a user when this users is deleted. Fixes TracksApp#1447
  create secrets.yml per rails upgrade instructions. It uses the secret key from site.yml
  make drag_action_title unambiguous
  ...

Resolved Conflicts:
	.gitignore
	.travis.yml
	Gemfile
	Gemfile.lock
	README.md
	app/assets/javascripts/tracks.js.erb
	app/controllers/contexts_controller.rb
	app/controllers/data_controller.rb
	app/controllers/integrations_controller.rb
	app/controllers/projects_controller.rb
	app/controllers/recurring_todos_controller.rb
	app/controllers/todos_controller.rb
	app/helpers/todos_helper.rb
	app/models/message_gateway.rb
	app/models/project.rb
	app/models/recurring_todo.rb
	app/models/todo.rb
	app/views/contexts/create.js.erb
	app/views/projects/update.js.erb
	app/views/projects/update_project_name.js.erb
	app/views/todos/_successor.html.erb
	app/views/todos/create.js.erb
	app/views/todos/update.js.erb
	config/application.rb
	config/initializers/secret_token.rb
	config/initializers/tracks.rb
	config/locales/es.yml
	config/locales/fr.yml
	config/routes.rb
	config/site.yml.tmpl
	db/tracks-blank.sqlite3.db
	db/tracks-example.sqlite3.db
	db/tracks-test.sqlite3.db
	doc/CHANGELOG.md
	features/context_list.feature
	features/manage_users.feature
	features/step_definitions/context_list_steps.rb
	features/step_definitions/project_list_steps.rb
	features/step_definitions/project_steps.rb
	features/step_definitions/todo_edit_steps.rb
	features/step_definitions/todo_steps.rb
	features/support/world.rb
	features/tickler.feature
	lib/tracks/done_todos.rb
	test/controllers/stats_controller_test.rb
	test/controllers/todos_controller_test.rb
	test/functional/recurring_todos_controller_test.rb
	test/models/project_test.rb
	test/unit/tagging_test.rb

.gitignore

@@ -1,27 +1,29 @@
-*~
+*.DS_Store
 *.tmproj
+*~
 .dotest
+.idea
+.rvmrc
+.ruby-gemset
+.ruby-version
+.sass-cache/
+.yardoc
+/.bundle
 /.emacs-project
 /.redcar
+/coverage
+/db/*.db
+/db/*.sqlite3
+/db/*.sqlite3-journal
+/log/*.log
+/public/assets/
+/tmp
 config/database.yml
-config/site.yml
 config/deploy.rb
-/db/*.sqlite3
-/db/*.db
+config/site.yml
 db/data.yml
-db/schema.rb
-/log/*.log
 nbproject
-/tmp
-vendor/plugins/query_trace/
 vendor/bundle/
 rerun.txt
-.idea
-.rvmrc
-.yardoc
 tags
-/.bundle
-/public/assets/
-.sass-cache/
-/coverage
 /bin

.travis.yml

@@ -1,17 +1,29 @@
 language: ruby
+
 rvm:
  - 1.9.3
+ - 2.0.0
+ - 2.1
+
+bundler_args: --without development
 
-before_install:
+before_script:
   - "mysql -e 'create database tracks_test;'"
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
   - "cp config/site.yml.tmpl config/site.yml"
   - "cp config/database.yml.tmpl config/database.yml"
 
-script: "bundle exec rake ci"
+script: "bin/rake ci"
 
-bundler_args: --without development
 notifications:
   email: false
+<<<<<<< HEAD
+=======
+  irc: "chat.freenode.net#tracks"
+>>>>>>> upgrade_irkeninvader.net
 
+addons:
+  code_climate:
+    repo_token:
+      secure: Ev0v5x9abxM+vlCdY7J/AHMP/Eq9FlhFtNlKSMnD3n2I1xWT0oB5kgidS3L+U0/janXxf4aNe28rDcj5AUePSoNBiSg6wzZ95D3Dz7AxqL9i61IQ/hllpA1kzQrTUsXtS5qAqa3H90Ev5hTQQahExjGvLB+1t8Ea2JBLR+8nUvU=

Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+<<<<<<< HEAD
 gem 'rails', '~>3.2.19'
 
 # you may comment out the database driver you will not be using.
@@ -65,7 +66,80 @@ group :test do
   # uncomment to use the webkit option. This depends on Qt to be installed
   # gem "capybara-webkit"
 
+=======
+gem 'rails', '~> 4.1.6'
+gem 'sass-rails', '~> 4.0.3'
+gem 'coffee-rails', '~> 4.0.1'
+
+#gem 'json'
+
+# todo: remove xml api
+gem 'actionpack-xml_parser', '~> 1.0.1'
+
+# See https://github.com/sstephenson/execjs#readme for more supported runtimes
+gem 'therubyracer'
+
+gem 'uglifier', '~> 2.5.3'
+
+gem 'jquery-rails', '~> 3.1.2'
+
+gem "pg"
+
+gem "RedCloth", "~> 4.2.9"
+gem "sanitize", "~> 3.0.2"
+gem "will_paginate", "~> 3.0.7"
+gem "acts_as_list", "~> 0.4.0"
+gem "aasm", "~> 3.4.0"
+gem "htmlentities", "~> 4.3.2"
+gem "swf_fu", "~> 2.0.4"
+gem "rails_autolink", "~> 1.1.6"
+gem "cache_digests", "~> 0.3.1"
+
+# To use ActiveModel has_secure_password
+gem 'bcrypt', '~> 3.1.7'
+
+# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
+# gem 'turbolinks'
+
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+# gem 'jbuilder', '~> 1.2'
+
+group :development do
+  gem "spring", "~> 1.1.3"
+  gem "spring-commands-cucumber", "~> 1.0.1"
+  gem "yard", "~> 0.8.7.4"
+
+  gem 'tolk', '~> 1.6.0'
+
+  gem "bullet", "~> 4.13.2"
+  gem "rack-mini-profiler", "~> 0.9.2"
+  gem "rack-dev-mark", "0.7.3"
+  gem "activerecord-deprecated_finders", "~> 1.0.3"
+end
+
+group :test do
+  gem "factory_girl_rails", "~> 4.4.1"
+  gem "capybara", "~> 2.4.3"
+  gem "cucumber-rails", "~> 1.4.1", :require => false
+  gem "rspec-expectations", "~> 3.1.2"
+  gem "database_cleaner", "~> 1.3.0"
+  gem "mocha", "~> 1.1.0", :require => false
+
+  gem "aruba", "~> 0.6.1", :require => false
+
+  # Note that > 2.14 has problems, see:
+  # https://code.google.com/p/selenium/issues/detail?id=3075
+  gem "selenium-webdriver"
+
+  # uncomment to use the webkit option. This depends on Qt being installed
+  # gem "capybara-webkit"
+
+>>>>>>> upgrade_irkeninvader.net
   # uncomment to be able to make screenshots from scenarios
   #gem "capybara-screenshot"
   #gem "launchy"
+
+  gem "simplecov", "~> 0.9.1"
+  # get test coverage info on codeclimate
+  gem "codeclimate-test-reporter", "~> 0.4.1", group: :test, require: nil
 end