delta/gitlab/gitlab-ce.git, branch da-feature-flags gitlab.com: gitlab-org/gitlab-ce.git Allow feature flag names to be a symbol 2018-07-20T00:05:24+00:00 Douglas Barbosa Alexandre dbalexandre@gmail.com 2018-07-20T00:05:24+00:00 06e03f6e4d3d60e30b38fe218a27c3907a3911cc 






Merge branch '5594-geo-add-repository-verification-failures-to-api' into 'master'
2018-07-19T18:32:12+00:00

Douglas Barbosa Alexandre
dbalexandre@gmail.com

2018-07-19T18:32:12+00:00

b60364c0f377f4afdf5e96e84aba11988f4ae526

Backport of gitlab-org/gitlab-ee!6137

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




Backport of gitlab-org/gitlab-ee!6137

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






Backport of gitlab-org/gitlab-ee!6137
2018-07-19T18:32:12+00:00

Valery Sizov
valery@gitlab.com

2018-07-19T18:32:12+00:00

c3c7f26a34d66ed4c2a5a2315c9b61e9a1ca27ee












Merge branch 'gitaly-ff-branch-nil' into 'master'
2018-07-19T17:48:58+00:00

Rémy Coutable
remy@rymai.me

2018-07-19T17:48:58+00:00

1df0a17a1dba03d11830da2560881374c726d1fc

Add missing Gitaly branch_update nil checks

Closes #49263

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




Add missing Gitaly branch_update nil checks

Closes #49263

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






Add missing Gitaly branch_update nil checks
2018-07-19T17:48:58+00:00

Jacob Vosmaer (GitLab)
jacob@gitlab.com

2018-07-19T17:48:58+00:00

805de7fb8d35a4bebb2f49f97584fe05a8bdd25a












Merge branch 'add-total-time-flat-printer-for-profiling' into 'master'
2018-07-19T15:36:38+00:00

Rémy Coutable
remy@rymai.me

2018-07-19T15:36:38+00:00

be2410ab18136df8ffc81d667879b4fefa61b732

Add a Gitlab::Profiler.print_by_total_time convenience method

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




Add a Gitlab::Profiler.print_by_total_time convenience method

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






Merge branch '49413-test-action-no-return' into 'master'
2018-07-19T15:05:42+00:00

Filipa Lacerda
filipa@gitlab.com

2018-07-19T15:05:42+00:00

91fcb311f9b760d6d7222d1f761274509fafa8cd

Allow testAction to work for async actions that don't return a Promise

Closes #49413

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




Allow testAction to work for async actions that don't return a Promise

Closes #49413

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






Add a Gitlab::Profiler.print_by_total_time convenience method
2018-07-19T15:00:27+00:00

Sean McGivern
sean@gitlab.com

2018-07-19T12:38:57+00:00

ef973f6f28f5b98ba126985b01d1c463e1cd8761

This method uses Gitlab::Profiler::TotalTimeFlatPrinter internally, which is the
same as RubyProf::FlatPrinter, but the min_percent option (and new max_percent
option) applies to the _total_ time, not the _self_ time. This helps us figure
out if we're calling a library inefficiently, for instance.





This method uses Gitlab::Profiler::TotalTimeFlatPrinter internally, which is the
same as RubyProf::FlatPrinter, but the min_percent option (and new max_percent
option) applies to the _total_ time, not the _self_ time. This helps us figure
out if we're calling a library inefficiently, for instance.







Merge branch 'frozen-string-enable-apps-services-inner-even-more' into 'master'
2018-07-19T14:50:54+00:00

Rémy Coutable
remy@rymai.me

2018-07-19T14:50:54+00:00

daa1ac0f08961ed22108deebadb789bfabd34149

Enable more frozen string in app/services/**/*.rb

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




Enable more frozen string in app/services/**/*.rb

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






allow for testAction to wait until all promises are resolved
2018-07-19T14:26:29+00:00

Lukas Eipert
leipert@gitlab.com

2018-07-19T14:26:29+00:00

0bb1009ced07bf58776d73992413af2c5cc4665f