gitlab-org--gitlab-foss/lib
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
..
api Merge branch 'master' into auto-pipelines-vue 2016-12-09 20:30:39 +01:00
assets
backup Fix Backup::Manager#remove_old 2016-12-07 13:27:44 +00:00
banzai Add shorthand support to gitlab markdown references 2016-12-02 19:18:17 -02:00
ci Send credentials array with build data 2016-11-21 15:01:06 +01:00
constraints Add nested groups support on data level 2016-12-08 11:47:16 +02:00
container_registry
generators/rails/post_deployment_migration
gitlab Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security' 2016-12-08 21:42:07 -03:00
json_web_token
mattermost Improve deploy command message 2016-11-21 21:36:22 +01:00
omni_auth
rouge/formatters
support
tasks Don't allow to specify a repo or version when installing Workhorse 2016-12-01 19:22:46 +01:00
banzai.rb
disable_email_interceptor.rb
email_template_interceptor.rb Add new configuration setting to enable/disable HTML emails. 2016-11-28 17:00:03 -05:00
event_filter.rb Add issue events filter and make sure "All" really shows everything 2016-12-04 23:07:22 +01:00
expand_variables.rb
extracts_path.rb
file_size_validator.rb
file_streamer.rb
gitlab.rb
gt_one_coercion.rb
repository_cache.rb
static_model.rb
unfold_form.rb
uploaded_file.rb
version_check.rb