delta/gitlab/gitlab-ce.git/lib, branch diff-scroll-point

Merge branch 'rename-ci-commit-phase-4' into 'master'

2016-06-10T14:31:21+00:00


Rename Commit to Pipeline in TriggerRequest

Changes in TriggerRequest a `commit` to `pipeline`.


See merge request !4505

Improve initial implementation of the 'only_allow_merge_if_build_succeeds.rb' feature

2016-06-10T12:36:57+00:00

Based on the feedback from reviewers.

Signed-off-by: Rémy Coutable

Allow or not merge MR with failed build

2016-06-10T12:36:54+00:00

Signed-off-by: Rémy Coutable

Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-4

2016-06-10T11:58:35+00:00

Fix expose of TriggerRequest

2016-06-10T11:58:33+00:00

Merge branch 'gh-rate-limit' into 'master'

2016-06-10T10:34:19+00:00


Wrap all rate limiting logic inside GitHub API client

## What does this MR do?

Move the actual rate limiting logic to GitHub API to clean the code inside the GitHub importer, and avoid code duplication.

## Are there points in the code the reviewer needs to double check?

No there aren't.

## Why was this MR needed?

Avoid code duplication to handle API rate limit in every call to the GitHub API.

## What are the relevant issue numbers?

There are none.

## Screenshots (if relevant)

Not relevant.

See merge request !4552

Merge branch 'award-emoji-fixes' into 'master'

2016-06-09T23:21:50+00:00


Award emoji fixes

Fixes #18357 #18325 and #18424

See merge request !4550

Properly quote table name in Rake task for MySQL and PostgreSQL compatibility

2016-06-09T22:06:19+00:00

!4318 broke the gitlab:db:drop_tables functionality for PostgreSQL.

Closes #15259

Merge branch 'fix_issue_15259' into 'master'

2016-06-09T21:44:10+00:00


Fix bug with SQL syntax error during backup restoration

## What does this MR do?
It properly escapes the table name in the `DROP TABLE IF EXISTS ...` statement used during restore of a backup.

## Are there points in the code the reviewer needs to double check?
Please check compatibility with PostgreSQL

## Why was this MR needed?
Fix an issue with backups can not be restored if MySQL is used as database for GitLab.

## What are the relevant issue numbers?
#15259 

## Screenshots (if relevant)
-

See merge request !4318

Fix CI TriggerRequest entity

2016-06-09T15:57:07+00:00