delta/gitlab/gitlab-ce.git/db, branch fix-project-last-commit-padding

Merge branch 'zj-create-mattermost-team' into 'master'

2017-03-06T20:02:52+00:00


Create Mattermost Team from GitLab

Closes #23964

See merge request !8746

Merge branch 'pipeline-blocking-actions' into 'master'

2017-03-06T19:16:01+00:00


Make manual actions blocking

Closes #26360 and #22628

See merge request !9585

Migrate legacy actions in post deployment migration

2017-03-06T17:24:55+00:00

Remove unecessary defaults for uniq ip block, cleanup refactoring leftovers

2017-03-06T14:45:43+00:00

align schema.rb with upstream and fix rubocop warning about not freezing mutable constants and empty error classes

2017-03-06T14:41:50+00:00

Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR review

2017-03-06T14:41:25+00:00

 - cleanup formating in haml
 - clarify time window is in seconds
 - cleanup straneous chunks in db/schema
 - rename count_uniqe_ips to update_and_return_ips_count
 - other

Allow limiting logging in users from too many different IPs.

2017-03-06T14:41:24+00:00

Merge branch 'master' into pipeline-blocking-actions

2017-03-06T14:11:28+00:00

* master: (26 commits)
  Fix UserBasic
  Rename `/take` to `/take_ownership`, expose `owner` in `v3`.
  Update after review
  Fix values being called at Array instead of Hash
  Fix json response in branches controller
  Improve docs and specs related to pages artifacts
  Add MR fo changelog about removing pages artifacts
  Delete artifacts for pages unless expiry date is specified
  Lint doc
  Improved team selection
  Move foreign key to separate migration
  Fix import model attributes
  Update documentation and expose ID
  Introduce tests for pipeline triggers
  Fix trigger model
  Update db/schema
  Make triggers to be user aware
  Make Pipeline Triggers to be user aware
  Update triggers API
  Remove remnants of git annex
  ...

Conflicts:
	db/schema.rb

Merge branch 'master' into 'zj-create-mattermost-team'

2017-03-06T14:04:14+00:00

# Conflicts:
#   db/schema.rb

Add migration for manual actions with skipped status

2017-03-06T09:50:35+00:00