delta/gitlab/gitlab-ce.git, branch jej/refactor-omniauth-controller gitlab.com: gitlab-org/gitlab-ce.git WIP: Adding LDAP login feature specs 2018-02-17T21:02:29+00:00 James Edwards-Jones jedwardsjones@gitlab.com 2018-02-17T18:50:38+00:00 1a0b733105c85578d3dfa7fd3950ab4e6164ed29 






Continued refactoring OmniauthCallbacksController
2018-02-17T21:02:21+00:00

James Edwards-Jones
jedwardsjones@gitlab.com

2018-01-26T04:10:09+00:00

2dcf1c10dd6a9f7f852a079f92688aaa75301e30

Extracted LDAP omniauth callback to its own controller
Added tests for LDAP login





Extracted LDAP omniauth callback to its own controller
Added tests for LDAP login







Refactor OmniauthCallbacksController to remove duplication
2018-02-17T20:54:28+00:00

James Edwards-Jones
jedwardsjones@gitlab.com

2018-01-24T20:23:24+00:00

ff8e4569b9453dce40e7c0b507fc84673681d88c












Merge branch '39917-revert-this-merge-request-text' into 'master'
2018-01-24T21:06:42+00:00

Fatih Acet
acetfatih@gmail.com

2018-01-24T21:06:42+00:00

44728e0527bc7c5cf982be2fbbd26e24a79e5d8f

Resolve ""Revert this merge request" modal has confusing string"

Closes #39917

See merge request gitlab-org/gitlab-ce!16611




Resolve ""Revert this merge request" modal has confusing string"

Closes #39917

See merge request gitlab-org/gitlab-ce!16611






Merge branch 'fix/add-formatted-data-to-wiki-page' into 'master'
2018-01-24T20:56:53+00:00

Robert Speicher
robert@gitlab.com

2018-01-24T20:56:53+00:00

caf84a0306450d97f6939393670aa8c4c807ddca

Add formatted_data attribute to Git::WikiPage

Closes #39805

See merge request gitlab-org/gitlab-ce!16682




Add formatted_data attribute to Git::WikiPage

Closes #39805

See merge request gitlab-org/gitlab-ce!16682






Merge branch 'search-100' into 'master'
2018-01-24T20:21:40+00:00

Yorick Peterse
yorickpeterse@gmail.com

2018-01-24T20:21:40+00:00

a349a4269c5194e53020e5909e9554bc1bfed40f

Use limit for search count queries

See merge request gitlab-org/gitlab-ce!16502




Use limit for search count queries

See merge request gitlab-org/gitlab-ce!16502






Add formatted_data attribute to Git::WikiPage
2018-01-24T20:14:11+00:00

Ahmad Sherif
me@ahmadsherif.com

2018-01-24T16:52:44+00:00

5735747050543a9e68aeb8f017c995e6119a9510

Related to #39805





Related to #39805







Merge branch '40744-idempotent-ids' into 'master'
2018-01-24T19:29:57+00:00

Robert Speicher
robert@gitlab.com

2018-01-24T19:29:57+00:00

f35bac576dd89a3fc8b601d0aef6e3f6d4888a09

Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'

Closes #30783

See merge request gitlab-org/gitlab-ce!16516




Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'

Closes #30783

See merge request gitlab-org/gitlab-ce!16516






Merge branch 'feature/migrate-get-lfs-ptrs-to-gitaly' into 'master'
2018-01-24T19:25:30+00:00

Robert Speicher
robert@gitlab.com

2018-01-24T19:25:30+00:00

8fe314e478e5767c6c351467a85c87ae30d043ea

Migrate .batch_lfs_pointers to Gitaly

Closes gitaly#921

See merge request gitlab-org/gitlab-ce!16517




Migrate .batch_lfs_pointers to Gitaly

Closes gitaly#921

See merge request gitlab-org/gitlab-ce!16517






Merge branch 'dm-project-system-hooks-in-transaction' into 'master'
2018-01-24T19:22:23+00:00

Robert Speicher
robert@gitlab.com

2018-01-24T19:22:23+00:00

956c55e2abf9c9780f37d14d69eb4b53fec4621e

Execute system hooks after-commit when executing project hooks

See merge request gitlab-org/gitlab-ce!16673




Execute system hooks after-commit when executing project hooks

See merge request gitlab-org/gitlab-ce!16673