Merge branch 'upstream' into feature/update_to_6.9_test

* upstream: (93 commits)
  New entries to CHANGELOG
  Specify language detection for highlight.js
  Show small notice at profile page about publicity
  Add users to /:id route
  DB cleaner reverted to a known working version
  Refactor link to new diff note rendering
  Smaller event width for mobile devices
  Improve tree view for mobile
  Make visibility icon more noticable
  Use same color for icon, arrow and project title on dash sidebar
  Small UI improvements
  Improve select2 css to match bootstrap style
  Disable fixtures
  Use bootstrap default padding for nav-tabs
  Gem update for database_cleaner
  Protect stable branches
  Temp fix for rspec so the specs are run again
  Revert "Revert "Fix for failing specs""
  Revert "Gemfile fix"
  fix permissions for files API
  ...

Conflicts:
	.travis.yml
	Gemfile.lock
	README.md
	app/assets/stylesheets/gl_bootstrap.scss
	app/assets/stylesheets/sections/dashboard.scss
	app/assets/stylesheets/sections/projects.scss
	app/controllers/admin/groups_controller.rb
	app/controllers/admin/projects_controller.rb
	app/controllers/admin/users_controller.rb
	app/controllers/users_controller.rb
	app/finders/projects_finder.rb
	app/helpers/notifications_helper.rb
	app/helpers/search_helper.rb
	app/models/concerns/issuable.rb
	app/models/note.rb
	app/models/project_team.rb
	app/services/search/global_service.rb
	app/views/admin/groups/show.html.haml
	app/views/admin/users/show.html.haml
	app/views/projects/commits/_text_file.html.haml
	app/views/users/_projects.html.haml
	app/views/users/show.html.haml
	config/environments/production.rb
	doc/install/installation.md
	doc/update/6.2-to-6.3.md
	features/profile/notifications.feature

.gitignore

@@ -24,6 +24,7 @@ config/gitlab.yml
 config/database.yml
 config/initializers/omniauth.rb
 config/initializers/rack_attack.rb
+config/initializers/smtp_settings.rb
 config/unicorn.rb
 config/resque.yml
 config/aws.yml

.travis.yml

@@ -5,7 +5,8 @@ env:
     - DB=postgresql
     - TRAVIS=true
   matrix:
-    - TASK=spinach DB=postgresql
+    - TASK=spinach_project DB=postgresql
+    - TASK=spinach_other DB=postgresql
     - TASK=spec:api DB=postgresql
     - TASK=spec:feature DB=postgresql
     - TASK=spec:other DB=postgresql

CHANGELOG

@@ -13,6 +13,19 @@ v 7.0.0
   - Group masters can create projects in group
   - Deprecate ruby 1.9.3 support
   - Only masters can rewrite/remove git tags
+  - Add X-Frame-Options SAMEORIGIN to Nginx config so Sidekiq admin is visible
+  - UI improvements
+  - Case-insensetive search for issues
+  - Update to rails 4.1
+  - Improve performance of application for projects and groups with a lot of members
+  - Formally support Ruby 2.1
+  - Include Nginx gitlab-ssl config
+  - Add manual language detection foir highlight.js
+  - Added example.com/:username routing
+  - Show notice if your profile is public
+  - UI improvements for mobile devices
+  - Improve diff rendering performance
+  - Drag-n-drop for issues and merge requests between states at milestone page 
 
 v 6.9.2
   - Revert the commit that broke the LDAP user filter

CONTRIBUTING.md

@@ -24,16 +24,11 @@ Issues and merge requests should be in English and contain appropriate language
 
 To get support for your particular problem please use the channels as detailed in the [getting help section of the readme](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/README.md#getting-help). Professional [support subscriptions](http://www.gitlab.com/subscription/) and [consulting services](http://www.gitlab.com/consultancy/) are available from [GitLab.com](http://www.gitlab.com/).
 
-The [issue tracker](https://gitlab.com/gitlab-org/gitlab-ce/issues) is only for obvious errors in the latest [stable or development release of GitLab](MAINTENANCE.md).
-If something is wrong but it is not a regression compared to older versions of GitLab please do not open an issue but a feature request.
-When submitting an issue please conform to the issue submission guidelines listed below.
-Not all issues will be addressed and your issue is more likely to be addressed if you submit a merge request which partially or fully addresses the issue.
+The [issue tracker](https://gitlab.com/gitlab-org/gitlab-ce/issues) is only for obvious errors in the latest [stable or development release of GitLab](MAINTENANCE.md). If something is wrong but it is not a regression compared to older versions of GitLab please do not open an issue but a feature request. When submitting an issue please conform to the issue submission guidelines listed below. Not all issues will be addressed and your issue is more likely to be addressed if you submit a merge request which partially or fully addresses the issue.
 
 Issues can be filed either at [gitlab.com](https://gitlab.com/gitlab-org/gitlab-ce/issues) or [github.com](https://github.com/gitlabhq/gitlabhq/issues).
 
-Do not use the issue tracker for feature requests.
-We have a specific [feature request forum](http://feedback.gitlab.com) for this purpose.
-Please keep feature requests as small and simple as possible, complex ones might be edited to make them small and simple.
+Do not use the issue tracker for feature requests. We have a specific [feature request forum](http://feedback.gitlab.com) for this purpose. Please keep feature requests as small and simple as possible, complex ones might be edited to make them small and simple.
 
 Please send a merge request with a tested solution or a merge request with a failing test instead of opening an issue if you can. If you're unsure where to post, post to the [mailing list](https://groups.google.com/forum/#!forum/gitlabhq) or [Stack Overflow](http://stackoverflow.com/questions/tagged/gitlab) first. There are a lot of helpful GitLab users there who may be able to help you quickly. If your particular issue turns out to be a bug, it will find its way from there.
 
@@ -42,16 +37,16 @@ Please send a merge request with a tested solution or a merge request with a fai
 **[Search the issues](https://gitlab.com/gitlab-org/gitlab-ce/issues)** for similar entries before submitting your own, there's a good chance somebody else had the same issue. Show your support with `:+1:` and/or join the discussion. Please submit issues in the following format (as the first post):
 
 1. **Summary:** Summarize your issue in one sentence (what goes wrong, what did you expect to happen)
-2. **Steps to reproduce:** How can we reproduce the issue, preferably on the [GitLab development virtual machine with vagrant](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/doc/development.md) (start your issue with: `vagrant destroy && vagrant up && vagrant ssh`)
-3. **Expected behavior:** Describe your issue in detail
-4. **Observed behavior**
-5. **Relevant logs and/or screenshots:** Please use code blocks (\`\`\`) to format console output, logs, and code as it's very hard to read otherwise.
-6. **Output of checks**
+1. **Steps to reproduce:** How can we reproduce the issue, preferably on the [GitLab development virtual machine with vagrant](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/doc/development.md) (start your issue with: `vagrant destroy && vagrant up && vagrant ssh`)
+1. **Expected behavior:** Describe your issue in detail
+1. **Observed behavior**
+1. **Relevant logs and/or screenshots:** Please use code blocks (\`\`\`) to format console output, logs, and code as it's very hard to read otherwise.
+1. **Output of checks**
     * Results of GitLab [Application Check](doc/install/installation.md#check-application-status) (`sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production`); we will only investigate if the tests are passing
     * Version of GitLab you are running; we will only investigate issues in the latest stable and development releases as per the [maintenance policy](MAINTENANCE.md)
     * Add the last commit sha1 of the GitLab version you used to replicate the issue (obtainable from the help page)
     * Describe your setup (use relevant parts from `sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production`)
-7. **Possible fixes**: If you can, link to the line of code that might be responsible for the problem
+1. **Possible fixes**: If you can, link to the line of code that might be responsible for the problem
 
 ## Merge requests
 
@@ -87,10 +82,10 @@ For examples of feedback on merge requests please look at already [closed merge
 **Please format your merge request description as follows:**
 
 1. What does this MR do?
-2. Are there points in the code the reviewer needs to double check?
-3. Why was this MR needed?
-4. What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?
-5. Screenshots (If appropiate)
+1. Are there points in the code the reviewer needs to double check?
+1. Why was this MR needed?
+1. What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?
+1. Screenshots (If appropiate)
 
 ## Contribution acceptance criteria
 
@@ -106,6 +101,7 @@ For examples of feedback on merge requests please look at already [closed merge
 1. It conforms to the following style guides
 
 ## Style guides
+
 1. [Ruby](https://github.com/bbatsov/ruby-style-guide)
 1. [Rails](https://github.com/bbatsov/rails-style-guide)
 1. [Formatting](https://github.com/thoughtbot/guides/tree/master/style#formatting)

Gemfile

@@ -9,7 +9,7 @@ def linux_only(require_as)
   RUBY_PLATFORM.include?('linux') && require_as
 end
 
-gem "rails", "~> 4.0.0"
+gem "rails", "~> 4.1.0"
 
 gem "protected_attributes"
 gem 'rails-observers'
@@ -240,7 +240,7 @@ group :development, :test do
   # gem 'rails-dev-tweaks'
   gem 'spinach-rails'
   gem "rspec-rails"
-  gem "capybara"
+  gem "capybara", '~> 2.2.1'
   gem "pry"
   gem 'pry-rails'
   # gem 'pry-rescue'
@@ -252,7 +252,7 @@ group :development, :test do
   gem "launchy"
 
   # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
-  gem 'minitest', '~> 4.7.0'
+  gem 'minitest', '~> 5.3.0'
 
   # Generate Fake data
   gem "ffaker"
@@ -266,9 +266,9 @@ group :development, :test do
   gem 'growl',      require: darwin_only('growl')
 
   # PhantomJS driver for Capybara
-  gem 'poltergeist', '~> 1.4.1'
+  gem 'poltergeist', '~> 1.5.1'
 
-  gem 'jasmine', '2.0.0.rc5'
+  gem 'jasmine', '2.0.2'
 
   gem "spring", '1.1.1'
   gem "spring-commands-rspec", '1.0.1'