gitlab-org--gitlab-foss/app/controllers
Grzegorz Bizon 0f40ae5f18 Merge branch 'master' into auto-pipelines-vue
* master: (76 commits)
  Update "Installation from source" guide for 8.15.0
  Group links spec update
  Updates the font weight of button styles because of the change to system fonts
  Refactor SSH keys docs
  Improvements to setting up ssh
  Do not reload diff for merge request made from fork when target branch in fork is updated
  Add 8.12.10, 8.12.11, and 8.12.12 CHANGELOG.md items
  Changes after review
  Fix broken test
  Adds CHANGELOG entry
  Adds tests
  Uniformize props name format
  Replace commit icon svg logic
  Replace play icon svg logic
  Updated JS based on review Fixed group links dropdown to match
  Update docs to reflect new defaults on omnibus
  Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security'
  Merge branch 'html-safe-diff-line-content' into 'security'
  Merge branch 'rs-filter-authentication_token' into 'security'
  Merge branch 'destroy-session' into 'security'
  ...

Conflicts:
	app/models/ci/pipeline.rb
	app/models/commit_status.rb
	app/views/projects/ci/pipelines/_pipeline.html.haml
	app/views/projects/commit/_pipeline.html.haml
	app/views/projects/pipelines/_with_tabs.html.haml
	app/views/projects/pipelines/index.html.haml
	lib/api/helpers.rb
2016-12-09 20:30:39 +01:00
..
admin Add nested groups support on data level 2016-12-08 11:47:16 +02:00
ci
concerns Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security' 2016-12-08 21:42:07 -03:00
dashboard
explore
groups Add nested groups support on data level 2016-12-08 11:47:16 +02:00
import
oauth
profiles
projects Merge branch 'master' into auto-pipelines-vue 2016-12-09 20:30:39 +01:00
sherlock
abuse_reports_controller.rb
application_controller.rb
autocomplete_controller.rb
confirmations_controller.rb
dashboard_controller.rb
emojis_controller.rb
groups_controller.rb
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
registrations_controller.rb Merge branch 'destroy-session' into 'security' 2016-12-08 21:21:06 -03:00
root_controller.rb
search_controller.rb
sent_notifications_controller.rb
sessions_controller.rb fix: 24982- Remove'Signed in successfully' message 2016-12-07 20:30:28 +05:30
snippets_controller.rb
uploads_controller.rb
users_controller.rb