delta/gitlab/gitlab-ce.git/config, branch ide-diff-cursor gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'mark-legacy-git-access' into 'master' 2018-03-23T10:20:45+00:00 Sean McGivern sean@mcgivern.me.uk 2018-03-23T10:20:45+00:00 bb9d360c0a7daed6aa08a0635e084c314c2c8b3e Route path lookups through legacy_disk_path See merge request gitlab-org/gitlab-ce!17743 
Route path lookups through legacy_disk_path

See merge request gitlab-org/gitlab-ce!17743
 Merge branch 'prettier-ignore' into 'master' 2018-03-22T19:46:39+00:00 Mike Greiling mike@pixelcog.com 2018-03-22T19:46:39+00:00 5c36e1b96a7c159a3f8a71528b14cc1c726a8bb9 Added prettierignore file Closes #44483 See merge request gitlab-org/gitlab-ce!17907 
Added prettierignore file

Closes #44483

See merge request gitlab-org/gitlab-ce!17907
 Merge branch 'move-concatenate-module-plugin' into 'master' 2018-03-22T19:41:48+00:00 Jacob Schatz jschatz@gitlab.com 2018-03-22T19:41:48+00:00 9087ea369e967fd36c34f39f7988a61ec31fc95a Disable webpack scope hoisting in development See merge request gitlab-org/gitlab-ce!17942 
Disable webpack scope hoisting in development

See merge request gitlab-org/gitlab-ce!17942
 enable scope hoisting only in produciton (it interferes with HMR) 2018-03-22T19:10:38+00:00 Mike Greiling mike@pixelcog.com 2018-03-22T19:10:38+00:00 907045b268c977bc97f2f6d54980ae4c65efa19c 






Force Rails to not complain about reloading
2018-03-22T15:58:53+00:00

Lin Jen-Shin
godfat@godfat.org

2018-03-22T15:57:40+00:00

c11825a2fc6f5dd0b7bc4033a34789c7d2445970

Same strategy with:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17810

See:
https://stackoverflow.com/a/29710188/1992201

Frankly I don't really understand how this works and I don't really
care either. However I tried it and it does the job. To try this,
make sure you have pending migrations, and run the server, hit the site.
It would tell you that there's pending migrations, and then run
migrations, and then hit the site again.

Without this patch, Rails would complain that "A copy of ...",
with this patch, it works without problems.





Same strategy with:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17810

See:
https://stackoverflow.com/a/29710188/1992201

Frankly I don't really understand how this works and I don't really
care either. However I tried it and it does the job. To try this,
make sure you have pending migrations, and run the server, hit the site.
It would tell you that there's pending migrations, and then run
migrations, and then hit the site again.

Without this patch, Rails would complain that "A copy of ...",
with this patch, it works without problems.







Merge branch 'jej/omniauth-initializer-refactor' into 'master'
2018-03-22T08:58:23+00:00

Douwe Maan
douwe@gitlab.com

2018-03-22T08:58:23+00:00

d14b842820a9672a8a7bbd85c636e7d16ec58c3d

OmniauthInitializer created to allow testing/refactoring of code from devise.rb

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




OmniauthInitializer created to allow testing/refactoring of code from devise.rb

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






Route path lookups through legacy_disk_path
2018-03-21T17:18:32+00:00

Jacob Vosmaer
jacob@gitlab.com

2018-03-14T13:42:49+00:00

008a6a6ce6fa943adcfecf3a606b845cfa282680












Merge branch 'blackst0ne-rails5-update-ar5-batching-initializer' into 'master'
2018-03-21T16:21:55+00:00

Robert Speicher
robert@gitlab.com

2018-03-21T16:21:55+00:00

294a9e98cfb50a1235581924b3139c7fca7aa2ad

[Rails5] Update ar5_batching initializer

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




[Rails5] Update ar5_batching initializer

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






Merge branch 'blackst0ne-rails5-update-ar5-pg-10-support-initializer' into 'master'
2018-03-21T16:20:29+00:00

Robert Speicher
robert@gitlab.com

2018-03-21T16:20:29+00:00

9942364f33c2949b003f9c4a26d60f1d10548756

[Rails5] Update ar5_pg_10_support initializer

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




[Rails5] Update ar5_pg_10_support initializer

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






Added prettierignore file
2018-03-21T15:13:14+00:00

Phil Hughes
me@iamphill.com

2018-03-21T15:13:14+00:00

6fa10e6a364c73fa3149f23a9a0a6962d9b4f70b

Closes #44483





Closes #44483