Merge branch 'release/undev_v2.5.0'

* release/undev_v2.5.0: (99 commits)
  fix syntax errors
  Send email to mentioned users
  File tokens -> Public links
  File tokens count on admin dashboard page
  Add newrelic.yml file
  Default value for usage_count field in File_tokens table
  Fix Usage count source
  Add newrelic gem
  Add usage staistics
  Change layout to filetokens page in project
  Chsnge constant name
  Add tokens page to profile
  Add navigation tab to Project page
  Remove argument from profile_tokens_path helper
  Improve project tokens page design
  add destroy token action
  fix project token path
  Swith link to public tokens for user from users to profiles
  Improve tokens, add user tokens to route, add destroy tokens button
  Improve tokens page
  ...
Merge branch 'develop'

* develop:
  Fix mails
fix deploy bug
Merge branch 'develop'

* develop:
  fix deploy bug
Fix comments in MR
Merge branch 'develop'

* develop:
  Fix comments in MR
Not support user mention for merge request. Only Note
Merge branch 'develop'

* develop:
  Not support user mention for merge request. Only Note
Ignore ActiveRecord::RecordNotFound error on newrelic
First step. Resolving conflicts
Second step of return teams
Merge branch 'upstream' into feature/update_to_6.1

* upstream: (47 commits)
  style fixes
  Version up to beta1
  Clear cache when update to 6.1
  More entries in CHANGELOG for 6.1
  UI fixes for commits lists
  Improve commits list UI
  update to project creation page to reflect default public project setting
  make public/private setting for project creation configurable
  Style guide fixes (spacing)
  Some of the requested updates, rebase on master
  API: admin users can sudo commands as other users
  Improve Merge Request form
  Add description to MergeRequest model
  Move commits dates to left
  Consistent status.
  Improved large commit handling.
  Forgot to fix the comment instructions.
  Fixed Import Bare Repositories instructions to match rake task.
  Fixed description.
  -i flag allows sudo to work for git users using rvm that is not being used by root user (su might be better)
  ...

Conflicts:
	app/contexts/commit_load_context.rb
	app/models/commit.rb
	app/models/merge_request.rb
	db/schema.rb
Group teams relations && update group edit cruds
Update deploy tasks to migrating
Fix key observer
fix migrations
Try repair task
faster deploy
Fix errors with teams contexts test adding
Merge branch 'upstream' into feature/update_to_6.1

* upstream: (45 commits)
  Update docs to use 6-1-stable branch
  Update gitlab_git to version 2.2.0. Fixes invalid diff in Compare
  Don't quote the default issue closing regex.
  Fix tests
  Fix 500 error on admin->project page
  Extend user infiormation displayed on admin user page
  Fix setting default values for user
  Let it be 6.1.0.rc1
  Update CHANGELOG with new entries for 6.1
  Use ruby 1.9 hash syntax
  Remove code that was accidently added in 5dae40f579f66fdc060de633b183ede7bd8b2ce4
  Update unicorn.rb.example
  notify commit author of new notes
  test if commit author receives new note notifications
  Add public-project? checkbox to new-project view
  Fix default settings when creating new Project
  Test.
  Replace remote url on selection.
  Typo fix.
  Notice about moving projects.
  ...

Conflicts:
	app/contexts/projects/create_context.rb
	app/controllers/groups_controller.rb
	app/helpers/application_helper.rb
	app/models/user.rb
	app/services/notification_service.rb
	app/views/admin/projects/show.html.haml
	config/routes.rb
	spec/services/notification_service_spec.rb