gitlab-org--gitlab-foss/app/controllers
Grzegorz Bizon 1a4c60ef57 Merge branch 'master' into feature/multi-level-container-registry-images
* master: (192 commits)
  Implement new service for creating user
  Update sentry-raven 2.0.2 -> 2.4.0
  Update webmock 1.21.0 -> 1.24.6
  Update spring 1.7.2 -> 2.0.1
  Update simplecov 0.12.0 -> 0.14.1
  Update pry-rails 0.3.4 -> 0.3.5
  Update pry-byebug 3.4.1 -> 3.4.2
  Update flay 2.6.1 -> 2.8.1
  Remove Tags filter from Projects Explore dropdown
  Update capybara-screenshot 1.0.11 -> 1.0.14
  Update bullet 5.2.0 -> 5.5.1
  Update brakeman 3.4.1 -> 3.6.1
  Remove web-console gem
  Update better_errors 1.0.1 -> 2.1.1
  Display flash message to unauthenticated user when creating new issue
  Fix up emoji tests that should have failed :/
  Fix RSpec/DescribeSymbol cop violations
  Add event limit warning all tabs Cycle Analytics
  Adding non_archived scope for counting projects
  Resolve "Gitlab administrator cannot create projects in every group"
  ...

Conflicts:
	db/schema.rb
2017-03-27 12:35:10 +02:00
..
admin Implement new service for creating user 2017-03-27 09:37:24 +00:00
ci
concerns All CI offline migrations 2017-03-17 23:06:11 +00:00
dashboard Revert "Merge branch '29534-todos-performance' into 'master'" 2017-03-21 15:25:00 +00:00
explore Eager load route & namespace in `Explore::ProjectsController` 2017-03-16 12:31:27 +01:00
groups Add count badges to both dashboard and group milestones 2017-03-10 13:04:19 +01:00
import Fix Error 500 when Bitbucket importer does not have authorization 2017-03-20 22:17:46 -07:00
oauth Remove duplicated code in Oauth::AuthorizationsController 2017-03-07 14:54:36 +01:00
profiles Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master' 2017-03-15 11:51:08 -07:00
projects Merge branch 'master' into feature/multi-level-container-registry-images 2017-03-27 12:35:10 +02:00
sherlock
abuse_reports_controller.rb
application_controller.rb Don't try to find a user by personal_access_token if the token is nil 2017-03-22 17:06:19 +01:00
autocomplete_controller.rb Fix autocomplete in EE when permissions are sent 2017-03-10 11:41:44 +00:00
confirmations_controller.rb
dashboard_controller.rb
groups_controller.rb use a magic default :global symbol instead of nil 2017-03-09 11:49:52 -08:00
health_check_controller.rb
help_controller.rb
invites_controller.rb
jwt_controller.rb
koding_controller.rb
notification_settings_controller.rb
omniauth_callbacks_controller.rb
passwords_controller.rb
profiles_controller.rb
projects_controller.rb Add ability to disable Merge Request URL on push 2017-03-17 12:35:39 +00:00
registrations_controller.rb Implement new service for creating user 2017-03-27 09:37:24 +00:00
root_controller.rb
search_controller.rb
sent_notifications_controller.rb
sessions_controller.rb Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR review 2017-03-06 15:41:25 +01:00
snippets_controller.rb
uploads_controller.rb
users_controller.rb Fixed pagination in projects & snippets on user page 2017-03-18 10:58:46 +00:00