[ci skip]

[ci skip]

Closes #2867

Closes #2692

[ci skip]

Dmitriy Zaporozhets authored 9 years ago and Robert Speicher committed 9 years ago

Fix bug where projects would appear to be stuck in the forked import state

A race condition existed between when Rails committed the `import_status` to
`started` and when the Sidekiq worker forked a project. If this fork were quick,
it's possible that the worker would attempt to move into the `finished` state
before the `started` state took effect.

As mentioned in https://github.com/mperham/sidekiq/wiki/Problems-and-Troubleshooting#cannot-find-modelname-with-id12345,
we can either delay the worker to ensure the DB has a chance to update, or use the nice `after_commit_queue` gem to schedule the task after the state machine commit. See:

* https://github.com/pluginaweek/state_machine/issues/191 
* https://github.com/shellycloud/after_commit_queue


Closes #2736

See merge request !1434

[ci skip]

[ci skip]

Update mailroom to 0.5.2

Fixes #2698 and #2711.

See merge request !1424

Closes #2585

Closes https://github.com/gitlabhq/gitlabhq/issues/9657

Closes #2702

[ci skip]

[ci skip]

[ci skip]

Closes #2653

[ci skip]

Fix CI permissions

![Screen_Shot_2015-09-21_at_20.23.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6f40699507d0dce148d0054a093f0d63/Screen_Shot_2015-09-21_at_20.23.16.png)

This fixes two problems:
- Allow developers to retry builds
- Hide advanced project options from CI page for non-admin users

See merge request !1379

Reported by https://github.com/gitlabhq/gitlabhq/issues/9643

Fail ci builds without yml

Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/2551

See merge request !1349

Closes #2586

Fixes #2536

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Closes https://github.com/gitlabhq/gitlabhq/issues/9640

add a test for to_hook_data of issue model

update CHANGELOG

Allow configuration of LDAP attributes GitLab will use for the new user account.

Fixes #2412.

See merge request !1261

Closes #2266

    Refactor upload and replace functionality

    Rename file and move CSS

    Fix typo

    Make dropzone a div

    Remove unnecessary file

    Change color of "upload existing one"

    Add missing changes

Use import_status to track async import status and give feedback to the user

Closes #2388
Closes #2400