gitlab-org--gitlab-foss/spec
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
..
bin
config
controllers Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security' 2016-12-08 21:42:07 -03:00
factories Added Ci::Stage specs 2016-12-06 16:04:30 +01:00
features Merge branch 'master' into auto-pipelines-vue 2016-12-09 20:30:39 +01:00
finders Merge branch '24733-archived-project-merge-request-count' into 'master' 2016-12-06 14:02:45 +00:00
fixtures adds impersonator variable and makes sudo usage overall more clear 2016-12-07 14:42:51 +00:00
helpers Merge branch 'html-safe-diff-line-content' into 'security' 2016-12-08 21:38:35 -03:00
initializers
javascripts Merge branch 'master' into auto-pipelines-vue 2016-12-09 20:30:39 +01:00
lib Merge branch 'dz-nested-groups' into 'master' 2016-12-09 01:52:36 +00:00
mailers
migrations
models Merge branch 'dz-nested-groups' into 'master' 2016-12-09 01:52:36 +00:00
policies
requests Merge branch 'api-remove-source-branch' into 'master' 2016-12-09 13:39:53 +00:00
routing
serializers Add status entity prototype and expose in pipeline 2016-12-07 16:46:37 +01:00
services Do not reload diff for merge request made from fork when target branch in fork is updated 2016-12-09 12:10:26 +01:00
support
tasks/gitlab
uploaders
views
workers
factories_spec.rb
rails_helper.rb
rake_helper.rb
simplecov_env.rb
spec_helper.rb
teaspoon_env.rb