delta/gitlab/gitlab-ce.git, branch 33819-authorby gitlab.com: gitlab-org/gitlab-ce.git correct ByAuthor translation in commit box 2017-06-19T01:50:22+00:00 Simon Knox psimyn@gmail.com 2017-06-19T01:50:22+00:00 8cef4b5e21349cee862c3e2f03fb8997a12cd9df 






Merge branch 'fix-atom-eslint' into 'master'
2017-06-18T07:52:18+00:00

Tim Zallmann
tzallmann@gitlab.com

2017-06-18T07:52:18+00:00

f01c5d8627ce069e84f04e587ab59ebbf7e8ac88

Fix eslint import resolver in Atom v1.18.0

See merge request !12238




Fix eslint import resolver in Atom v1.18.0

See merge request !12238






Merge branch 'mr-widget-memory-usage-tech-debt-fix' into 'master'
2017-06-17T08:27:42+00:00

Phil Hughes
me@iamphill.com

2017-06-17T08:27:42+00:00

74b26c7ccab2715b963124936b80c483889fce37

Changed utilites imports from ~ to relative paths

Closes #33485

See merge request !12026




Changed utilites imports from ~ to relative paths

Closes #33485

See merge request !12026






refactor zopfli fallback config
2017-06-17T00:21:15+00:00

Mike Greiling
mike@pixelcog.com

2017-06-16T20:16:52+00:00

3265670327ed8900f2cb6a3df5eec05de3f93096












don't make assumptions about command line arguments invoking webpack config
2017-06-17T00:21:07+00:00

Mike Greiling
mike@pixelcog.com

2017-06-16T20:15:54+00:00

e0dbfacf6eae0ef6ce1f641e5057bc89c9478b47












Merge branch 'rs-revert-11842' into 'master'
2017-06-16T21:34:41+00:00

Stan Hu
stanhu@gmail.com

2017-06-16T21:34:41+00:00

ad521bde1bb556709edd39d8a9aa67ee47605b91

Partially revert 1e8dbd46

See merge request !12236




Partially revert 1e8dbd46

See merge request !12236






Merge branch 'remove_unnecessary_spec_file' into 'master'
2017-06-16T20:49:08+00:00

Robert Speicher
robert@gitlab.com

2017-06-16T20:49:08+00:00

3a38e5f1ab914bc4eaeecda6e18caaa7ca9ea5a7

Remove unnecessary spec file

See merge request !12233




Remove unnecessary spec file

See merge request !12233






Merge branch 'increase-karma-socket-timeout' into 'master'
2017-06-16T20:40:28+00:00

Clement Ho
clemmakesapps@gmail.com

2017-06-16T20:40:28+00:00

b78de222a0d2c15b95a31bde9572b6c704a3578d

Increase karma socket timeout

Closes #33735

See merge request !12226




Increase karma socket timeout

Closes #33735

See merge request !12226






Increase karma socket timeout
2017-06-16T20:40:28+00:00

Mike Greiling
mgreiling@gitlab.com

2017-06-16T20:40:28+00:00

e5a91870fd2a4eefd086aa88e3b5ea02e2fbc768












Merge branch 'boards-spec-fix' into 'master'
2017-06-16T20:30:35+00:00

Robert Speicher
robert@gitlab.com

2017-06-16T20:30:35+00:00

f2505eb6ce87877f78ee90c8567f879bcd77642b

Fixes boards_spec failure

Closes #33614

See merge request !12230




Fixes boards_spec failure

Closes #33614

See merge request !12230