delta/gitlab/gitlab-ce.git/app/models/project_services, branch ci-https

Changed Slack service user referencing from full name to username

2016-10-02T22:44:47+00:00

Fixes issue with rails reserved keyword type exporting/importing services. Also fixed CustomIssueTrackerService title setter and added relevant specs.

2016-09-26T07:49:05+00:00

Merge remote-tracking branch 'upstream/master' into pipeline-hooks

2016-09-06T08:23:17+00:00

* upstream/master: (368 commits)
  Don't fail on an empty database
  Refactor authorization_for_merge_requests.md
  Support MySQL too, when removing gitorious from import_sources
  Remove gitorious from import_sources on ApplicationSetting model
  Add links to new docs in merge_requests.md and workflow/README.md
  Move merge request versions to its own document
  Move "Only allow merge requests to be merged if the build succeeds" to new location
  Move revert_changes.md to new location
  Move cherry_pick_changes.md to new location
  Move `wip_merge_requests.md` to a new location
  Move merge_when_build_succeeds.md to new location
  Fix missing flash messages on service edit page
  Move authorization_for_merge_requests.md to new location
  Move `workflow/merge_requests.md` to `user/project/merge_requests.md`
  Update README.md
  Fix randomly failing specs in expand_collapse_diff_spec:
  Add link on API docs index page
  Move CHANGELOG entries of !5361, !5451 and !5887 from 8.11 to 8.12
  Remove suggested colors hover underline
  Fix markdown anchor icon interaction
  ...

Add option to confidential issues events to trigger services

2016-08-31T21:34:45+00:00

Merge remote-tracking branch 'upstream/master' into pipeline-hooks

2016-08-24T13:04:38+00:00

* upstream/master: (1174 commits)
  Added CHANGELOG
  Added unfold test to parallel and added 'diff discussion' context
  Fix Spinach branches spec
  Better first match on this MR also
  Change merge_error column from string to text type
  Fix typo in gitlab_flow.md
  entities: make Environment inherit EnvironmentBasic
  Updated to optimized specs from !5864
  Added 'with an unfolded line should not allow commenting' scenario (line 125)
  Added addtional 'renderable' validator to check 'data-note-type' attr exists
  Allow passing an index to selectRowAtIndex
  Fixed enter key in search input not working
  Fix file links on project page Files view
  Fix incorrect "stopped impersonation" log message
  8.11 is released, long live 8.12
  Also check if Akismet is enabled, before showing the `Submit as spam` button.
  fix location of markdown help location
  Fix for update 8.10-to-8.11.md doc.
  Appease the linter.
  Add Ruby 2.3 upgrade notes.
  ...

Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slack

2016-08-15T18:36:06+00:00

Ability to specify branches for pivotal tracker integration

2016-08-15T08:01:41+00:00

Simplify the name for data builder, feedback:

2016-08-12T08:09:29+00:00

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13671791

Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slack

2016-08-11T15:10:28+00:00

# Conflicts:
#	app/models/ci/pipeline.rb
#	app/services/ci/create_pipeline_service.rb
#	spec/models/project_services/hipchat_service_spec.rb

Replace the tinder gem by bare HTTP requests

2016-08-11T06:52:13+00:00