Merge branch 'upstream' into feature/update_to_6.9

* upstream: (571 commits)
  Fix group projects fetch
  Improve group settings UI
  Fix group tests
  Improve help page content
  Use more logic class names for buttons in panel headings
  Remove ui-box css
  Move from ui-box to panels
  Replace ui-box title with panel-heading
  Replace ui-box with panel.panel-default
  Download schema.rb.bundled if necessary
  No need to copy the unicorn file if you use the cookbook.
  We need shortcuts route.
  Add deprecation to changelog.
  Ruby 2.0+ is a requirement.
  Fix feature.
  Make the updating documetation better for Omnibus users.
  Fix routing tests.
  Replace existing links to help pages with the new ones.
  Use the correct links, replace in search.
  Remove list items styling in show render.
  ...

Conflicts:
	.travis.yml
	Gemfile
	Gemfile.lock
	Procfile
	app/assets/javascripts/application.js.coffee
	app/assets/javascripts/notes.js.coffee
	app/assets/stylesheets/application.scss
	app/assets/stylesheets/generic/ui_box.scss
	app/controllers/admin/projects_controller.rb
	app/controllers/groups_controller.rb
	app/controllers/projects/branches_controller.rb
	app/controllers/projects/edit_tree_controller.rb
	app/controllers/projects/merge_requests_controller.rb
	app/controllers/projects/notes_controller.rb
	app/controllers/projects/tags_controller.rb
	app/controllers/projects_controller.rb
	app/finders/notes_finder.rb
	app/helpers/commits_helper.rb
	app/helpers/merge_requests_helper.rb
	app/helpers/namespaces_helper.rb
	app/helpers/tree_helper.rb
	app/mailers/emails/issues.rb
	app/mailers/emails/merge_requests.rb
	app/mailers/emails/notes.rb
	app/models/email.rb
	app/models/event.rb
	app/models/merge_request.rb
	app/models/milestone.rb
	app/models/note.rb
	app/models/project.rb
	app/models/project_services/assembla_service.rb
	app/models/project_services/campfire_service.rb
	app/models/project_services/emails_on_push_service.rb
	app/models/project_services/flowdock_service.rb
	app/models/project_services/gemnasium_service.rb
	app/models/project_services/gitlab_ci_service.rb
	app/models/project_services/pivotaltracker_service.rb
	app/models/project_services/slack_message.rb
	app/models/project_services/slack_service.rb
	app/models/service.rb
	app/models/service/hipchat.rb
	app/models/user.rb
	app/observers/issue_observer.rb
	app/observers/key_observer.rb
	app/observers/merge_request_observer.rb
	app/observers/users_project_observer.rb
	app/services/base_service.rb
	app/services/git_push_service.rb
	app/services/notification_service.rb
	app/services/projects/create_service.rb
	app/services/projects/transfer_service.rb
	app/views/admin/users/show.html.haml
	app/views/devise/sessions/new.html.haml
	app/views/events/_event.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/_settings_nav.html.haml
	app/views/groups/edit.html.haml
	app/views/groups/members.html.haml
	app/views/layouts/_head_panel.html.haml
	app/views/notify/closed_merge_request_email.html.haml
	app/views/notify/closed_merge_request_email.text.haml
	app/views/notify/merged_merge_request_email.html.haml
	app/views/notify/merged_merge_request_email.text.haml
	app/views/profiles/show.html.haml
	app/views/projects/branches/_filter.html.haml
	app/views/projects/edit_tree/preview.html.haml
	app/views/projects/edit_tree/show.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/merge_requests/show/_mr_box.html.haml
	app/views/projects/notes/_discussion_diff.html.haml
	app/views/projects/notes/_form.html.haml
	app/views/projects/notes/_notes_with_form.html.haml
	app/views/projects/services/_form.html.haml
	app/views/projects/show.html.haml
	app/views/projects/team_members/_group_members.html.haml
	app/views/projects/team_members/_team.html.haml
	app/views/projects/team_members/index.html.haml
	app/views/users/_projects.html.haml
	bin/background_jobs
	config/application.rb
	config/initializers/1_settings.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb
	db/fixtures/development/10_merge_requests.rb
	db/schema.rb
	lib/api/api.rb
	lib/api/groups.rb
	lib/gitlab/diff_parser.rb
	lib/gitlab/git_access.rb
	lib/redcarpet/render/gitlab_html.rb
	lib/tasks/gitlab/enable_namespaces.rake
	spec/features/admin/admin_projects_spec.rb
	spec/helpers/application_helper_spec.rb
	spec/mailers/notify_spec.rb
	spec/models/assembla_service_spec.rb
	spec/models/event_spec.rb
	spec/models/merge_request_spec.rb
	spec/models/project_hook_spec.rb
	spec/models/project_spec.rb
	spec/models/service/flowdock_spec.rb
	spec/models/service/gitlab_ci_spec.rb
	spec/models/service_spec.rb
	spec/models/slack_message_spec.rb
	spec/models/user_spec.rb
	spec/observers/issue_observer_spec.rb
	spec/observers/merge_request_observer_spec.rb
	spec/observers/users_project_observer_spec.rb
	spec/requests/api/projects_spec.rb
	spec/requests/api/services_spec.rb
	spec/services/git_push_service_spec.rb
	spec/services/notification_service_spec.rb
	spec/services/projects/transfer_service_spec.rb

.gitignore

@@ -40,3 +40,4 @@ public/uploads.*
 public/system/
 public/assets/
 .envrc
+dump.rdb

.pkgr.yml

@@ -0,0 +1,19 @@
+user: git
+group: git
+before_precompile: ./bin/pkgr_before_precompile.sh
+targets:
+  debian-7: &wheezy
+    build_dependencies:
+      - libicu-dev
+    dependencies:
+      - libicu48
+      - libpcre3
+      - git
+  ubuntu-12.04: *wheezy
+  ubuntu-14.04:
+    build_dependencies:
+      - libicu-dev
+    dependencies:
+      - libicu52
+      - libpcre3
+      - git

.travis.yml

@@ -5,9 +5,11 @@ env:
     - DB=postgresql
     - TRAVIS=true
   matrix:
-    - TASK=jasmine:ci
-    - TASK=spec
-    - TASK=spinach
+    - TASK=spinach DB=postgresql
+    - TASK=spec:api DB=postgresql
+    - TASK=spec:feature DB=postgresql
+    - TASK=spec:other DB=postgresql
+    - TASK=jasmine:ci DB=postgresql
 before_install:
   - sudo apt-get install libicu-dev -y
 branches:

CHANGELOG

@@ -1,10 +1,69 @@
+v 7.0.0
+  - The CPU no longer overheats when you hold down the spacebar
+  - Improve edit file UI
+  - Add ability to upload group avatar when create
+  - Protected branch cannot be removed
+  - Developers can remove normal branches with UI
+  - Remove branch via API (sponsored by O'Reilly Media)
+  - Move protected branches page to Project settings area
+  - Redirect to Files view when create new branch via UI
+  - Drag and drop upload of image in every markdown-area (Earle Randolph Bunao and Neil Francis Calabroso)
+  - Refactor the markdown relative links processing
+  - Make it easier to implement other CI services for GitLab
+  - Group masters can create projects in group
+  - Deprecate ruby 1.9.3 support
+
+v 6.9.1
+  - Fix scroll to highlighted line
+  - Fix the pagination on load for commits page
+
+v 6.9.0
+  - Store Rails cache data in the Redis `cache:gitlab` namespace
+  - Adjust MySQL limits for existing installations
+  - Add db index on project_id+iid column. This prevents duplicate on iid (During migration duplicates will be removed)
+  - Markdown preview or diff during editing via web editor (Evgeniy Sokovikov)
+  - Give the Rails cache its own Redis namespace
+  - Add ability to set different ssh host, if different from http/https
+  - Fix syntax highlighting for code comments blocks
+  - Improve comments loading logic
+  - Stop refreshing comments when the tab is hidden
+  - Improve issue and merge request mobile UI (Drew Blessing)
+  - Document how to convert a backup to PostgreSQL
+  - Fix locale bug in backup manager
+  - Fix can not automerge when MR description is too long
+  - Fix wiki backup skip bug
+  - Two Step MR creation process
+  - Remove unwanted files from satellite working directory with git clean -fdx
+  - Accept merge request via API (sponsored by O'Reilly Media)
+  - Add more access checks during API calls
+  - Block SSH access for 'disabled' Active Directory users
+  - Labels for merge requests (Drew Blessing)
+  - Threaded emails by setting a Message-ID (Philip Blatter)
+
 v 6.8.0
   - Ability to at mention users that are participating in issue and merge req. discussion
   - Enabled GZip Compression for assets in example Nginx, make sure that Nginx is compiled with --with-http_gzip_static_module flag (this is default in Ubuntu)
   - Make user search case-insensitive (Christopher Arnold)
   - Remove omniauth-ldap nickname bug workaround
   - Drop all tables before restoring a Postgres backup
   - Make the repository downloads path configurable
+  - Create branches via API (sponsored by O'Reilly Media)
+  - Changed permission of gitlab-satellites directory not to be world accessible
+  - Protected branch does not allow force push
+  - Fix popen bug in `rake gitlab:satellites:create`
+  - Disable connection reaping for MySQL
+  - Allow oauth signup without email for twitter and github
+  - Fix faulty namespace names that caused 500 on user creation
+  - Option to disable standard login
+  - Clean old created archives from repository downloads directory
+  - Fix download link for huge MR diffs
+  - Expose event and mergerequest timestamps in API
+  - Fix emails on push service when only one commit is pushed
+
+v 6.7.3
+  - Fix the merge notification email not being sent (Pierre de La Morinerie)
+  - Drop all tables before restoring a Postgres backup
+  - Remove yanked modernizr gem
 
 v 6.7.2
   - Fix upgrader script

CONTRIBUTING.md

@@ -29,7 +29,11 @@ If something is wrong but it is not a regression compared to older versions of G
 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.
 
-Do not use the issue tracker for feature requests. We have a specific [feature request forum](http://feedback.gitlab.com) for this purpose.
+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.
 
 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.
 
@@ -53,6 +57,8 @@ Please send a merge request with a tested solution or a merge request with a fai
 
 We welcome merge requests with fixes and improvements to GitLab code, tests, and/or documentation. The features we would really like a merge request for are listed with the [status 'accepting merge requests' on our feature request forum](http://feedback.gitlab.com/forums/176466-general/status/796455) but other improvements are also welcome. If you want to add a new feature that is not marked it is best to first create a feedback issue (if there isn't one already) and leave a comment asking for it to be marked accepting merge requests. Please include screenshots or wireframes if the feature will also change the UI.
 
+Merge requests can be filed either at [gitlab.com](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests) or [github.com](https://github.com/gitlabhq/gitlabhq/pulls).
+
 ### Merge request guidelines
 
 If you can, please submit a merge request with the fix or improvements including tests. If you don't know how to fix the issue but can write a test that exposes the issue we will accept that as well. In general bug fixes that include a regression test are merged quickly while new features without proper tests are least likely to receive timely feedback. The workflow to make a merge request is as follows:
@@ -72,7 +78,7 @@ If you can, please submit a merge request with the fix or improvements including
 1. Be prepared to answer questions and incorporate feedback even if requests for this arrive weeks or months after your MR submittion
 1. If your MR touches code that executes shell commands, make sure it adheres to the [shell command guidelines](    doc/development/shell_commands.md).
 
-The **official merge window** is in the beginning of the month from the 1st to the 7th day of the month. The best time to submit a MR and get feedback fast. Before this time the GitLab.com team is still dealing with work that is created by the monthly release such as assisting subscribers with upgrade issues, the release of Enterprise Edition and the upgrade of GitLab Cloud. After the 7th it is already getting closer to the release date of the next version. This means there is less time to fix the issues created by merging large new features.
+The **official merge window** is in the beginning of the month from the 1st to the 7th day of the month. The best time to submit a MR and get feedback fast. Before this time the GitLab B.V. team is still dealing with work that is created by the monthly release such as assisting subscribers with upgrade issues, the release of Enterprise Edition and the upgrade of GitLab Cloud. After the 7th it is already getting closer to the release date of the next version. This means there is less time to fix the issues created by merging large new features.
 
 Please keep the change in a single MR **as small as possible**. If you want to contribute a large feature think very hard what the minimum viable change is. Can you split functionality? Can you only submit the backend/API code? Can you start with a very simple UI? The smaller a MR is the more likely it is it will be merged, after that you can send more MR's to enhance it.
 
@@ -100,8 +106,11 @@ 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 style guide](https://github.com/bbatsov/ruby-style-guide)
-1. [Rails style guide](https://github.com/bbatsov/rails-style-guide)
-1. [CoffeeScript style guide](https://github.com/polarmobile/coffeescript-style-guide)
-1. [Shell command guidelines](doc/development/shell_commands.md)
+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)
+1. [Naming](https://github.com/thoughtbot/guides/tree/master/style#naming) 
+1. [Testing](https://github.com/thoughtbot/guides/tree/master/style#testing)
+1. [CoffeeScript](https://github.com/thoughtbot/guides/tree/master/style#coffeescript)
+1. [Shell commands](doc/development/shell_commands.md)
+1. [Markdown](http://www.cirosantilli.com/markdown-styleguide)

Gemfile

@@ -13,8 +13,6 @@ gem "rails", "~> 4.0.0"
 
 gem "protected_attributes"
 gem 'rails-observers'
-gem 'actionpack-page_caching'
-gem 'actionpack-action_caching'
 
 # Default values for AR models
 gem "default_value_for", "~> 3.0.0"
@@ -37,7 +35,7 @@ gem 'elasticsearch-git', github: 'zzet/elasticsearch-git', ref: 'c861d5d98c7bf44
 
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem "gitlab_git", '~> 5.7.1'
+gem "gitlab_git", '~> 5.8'
 gem 'rugged', git: 'git://github.com/libgit2/rugged.git', branch: 'development', submodules: true
 
 # Ruby/Rack Git Smart-HTTP Server Handler
@@ -47,15 +45,15 @@ gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
 gem 'gitlab_omniauth-ldap', '1.0.4', require: "omniauth-ldap"
 
 # Git Wiki
-gem "gitlab-gollum-lib", "~> 1.1.0", require: 'gollum-lib'
+gem 'gollum-lib', '~> 3.0.0'
 
 # Language detection
 gem "gitlab-linguist", "~> 3.0.0", require: "linguist"
 
 # API
 gem "grape", "~> 0.6.1"
 # Replace with rubygems when nesteted entities get released
-gem "grape-entity", "~> 0.4.1", ref: 'd904381c951e86250c3f44213b349a3dd8e83fb1', git: 'https://github.com/intridea/grape-entity.git' 
+gem "grape-entity", "~> 0.4.2"
 gem 'rack-cors', require: 'rack/cors'
 
 # Email validation
@@ -80,8 +78,12 @@ gem "haml-rails"
 # Files attachments
 gem "carrierwave"
 
+# Drag and Drop UI
+gem 'dropzonejs-rails'
+
 # for aws storage
-gem "fog", "~> 1.3.1", group: :aws
+gem "fog", "~> 1.14", group: :aws
+gem "unf", group: :aws
 
 # Authorization
 gem "six"
@@ -91,10 +93,11 @@ gem "seed-fu"
 
 # Markdown to HTML
 gem "redcarpet",     "~> 2.2.2"
-gem "github-markup", "~> 0.7.4", require: 'github/markup', git: 'https://github.com/gitlabhq/markup.git', ref: '61ade389c1e1c159359338f570d18464a44ddbc4' 
+gem "github-markup"
+gem "org-ruby" # For rendering .org files
 
 # Diffs
-gem "diffy"
+gem 'diffy', '~> 3.0.3'
 
 # Asciidoc to HTML
 gem "asciidoctor"
@@ -153,7 +156,7 @@ gem "gitlab-flowdock-git-hook", "~> 0.4.2"
 gem "gemnasium-gitlab-service", "~> 0.2"
 
 # Slack integration
-gem "slack-notifier", "~> 0.2.0"
+gem "slack-notifier", "~> 0.3.2"
 
 # d3
 gem "d3_rails", "~> 3.1.4"
@@ -162,15 +165,15 @@ gem "d3_rails", "~> 3.1.4"
 gem "underscore-rails", "~> 1.4.4"
 
 # Sanitize user input
-gem "sanitize"
+gem "sanitize", '~> 2.0'
 
 # Protect against bruteforcing
 gem "rack-attack"
 
 # Ace editor
 gem 'ace-rails-ap'
 
-gem "sass-rails"
+gem "sass-rails", '~> 4.0.2'
 gem "coffee-rails"
 gem "uglifier"
 gem "therubyracer"
@@ -179,8 +182,9 @@ gem 'jquery-turbolinks'
 
 gem 'select2-rails'
 gem 'jquery-atwho-rails', "~> 0.3.3"
-gem "jquery-rails",     "2.1.3"
-gem "jquery-ui-rails",  "2.0.2"
+gem "jquery-rails"
+gem "jquery-ui-rails"
+gem "jquery-scrollto-rails"
 gem "raphael-rails", "~> 2.1.2"
 gem 'bootstrap-sass', '~> 3.0'
 gem "font-awesome-rails", '~> 3.2'