gitlab-org--gitlab-foss/lib
Grzegorz Bizon 3deaf1342e Merge branch 'master' into auto-pipelines-vue
* master: (367 commits)
  Set “Remove branch” button to default size
  remove unused helper method
  reduce common code even further to satisfy rake flay
  remove button class size alteration from revert and cherry pick links
  factor out common code to satisfy rake flay
  homogenize revert and cherry-pick button styles generated by commits_helper
  apply margin on alert banners only when there is one or more alerts
  Rename MattermostNotificationService back to MattermostService
  Rename SlackNotificationService back to SlackService
  Fix stage and pipeline specs and rubocop offenses
  Added QueryRecorder to test N+1 fix on Milestone#show
  Use gitlab-workhorse 1.2.1
  Make 'unmarked as WIP' message more consistent
  Improve specs for Files API
  Allow unauthenticated access to Repositories Files API GET endpoints
  Add isolated view spec for pipeline stage partial
  Move test for HTML stage endpoint to controller specs
  Fix sizing of avatar circles; add border
  Fix broken test
  Fix broken test Changes after review
  ...

Conflicts:
	app/assets/stylesheets/pages/pipelines.scss
	app/controllers/projects/pipelines_controller.rb
	app/views/projects/pipelines/index.html.haml
	spec/features/projects/pipelines/pipelines_spec.rb
2016-12-21 12:09:06 +01:00
..
api Merge branch 'master' into auto-pipelines-vue 2016-12-21 12:09:06 +01:00
assets
backup Fix Backup::Manager#remove_old 2016-12-07 13:27:44 +00:00
banzai Merge branch 'katex-math' into 'master' 2016-12-15 14:11:38 +00:00
bitbucket Add Wiki import to BB importer 2016-12-19 20:48:08 +02:00
ci Merge branch 'fix-forbidden-for-build-api-for-deleted-project' into 'master' 2016-12-20 07:18:13 +00:00
constraints Add nested groups support on data level 2016-12-08 11:47:16 +02:00
container_registry Make rubocop happy 2016-07-15 18:05:39 +02:00
generators/rails/post_deployment_migration require rails/generators for generators 2016-11-01 21:44:27 +01:00
gitlab Merge branch '22348-gitea-importer' into 'master' 2016-12-20 11:11:24 +00:00
json_web_token
mattermost Merge branch 'zj-kamil-slack-slash-commands' into 'master' 2016-12-20 09:41:37 +00:00
omni_auth
omniauth/strategies Fix BB authentication[ci skip] 2016-12-14 11:54:17 +02:00
rouge Render math in Asciidoc and Markdown with KaTeX using code blocks 2016-12-14 16:50:54 +00:00
support Upgrade NGINX configuration files to add websocket support 2016-12-12 12:58:42 +00:00
tasks Add LDAP task to rename a provider 2016-12-16 09:57:05 -06:00
banzai.rb Add markdown cache columns to the database, but don't use them yet 2016-10-07 02:54:25 +01:00
disable_email_interceptor.rb Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
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 Update support for dynamic environments 2016-09-19 10:07:13 +02:00
extracts_path.rb Remove 'extended_sha1' option from ExtractsPath module 2016-11-06 12:33:39 +09:00
file_size_validator.rb
file_streamer.rb
gitlab.rb
gt_one_coercion.rb
repository_cache.rb Use project ID in repository cache to prevent stale data from persisting across projects 2016-07-25 05:09:28 -07:00
static_model.rb
unfold_form.rb
uploaded_file.rb Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
version_check.rb