delta/gitlab/gitlab-ce.git/app/helpers, branch fix/encoding-binary-issue gitlab.com: gitlab-org/gitlab-ce.git Resolve "When changing project visibility setting, change other dropdowns automatically" 2017-06-06T08:28:39+00:00 Mike Greiling mgreiling@gitlab.com 2017-06-06T08:28:39+00:00 e245d7eebe747378f4158b30634ab0da4df59117 






Merge branch 'dz-fix-submodule-subgroup' into 'master'
2017-06-05T17:39:36+00:00

Douwe Maan
douwe@gitlab.com

2017-06-05T17:39:36+00:00

5872273841ad7080fb2c8addaeb67712d1b8bf37

Fix submodule link to then project under subgroup

Closes gitlab-ee#2411

See merge request !11906




Fix submodule link to then project under subgroup

Closes gitlab-ee#2411

See merge request !11906






Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'
2017-06-05T10:42:33+00:00

Phil Hughes
me@iamphill.com

2017-06-05T10:42:33+00:00

c34107608ecc5c36e80a748eb4c9b88d2b1157cf

Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.

See merge request !11478




Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.

See merge request !11478






Merge branch '30469-convdev-index' into 'master'
2017-06-05T09:18:12+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-06-05T09:18:12+00:00

3b39cf4e0c5d0ca680a40bb7232fee4f7fdfb02e

ConvDev Index

Closes #30469

See merge request !11377




ConvDev Index

Closes #30469

See merge request !11377






Fix submodule link to then project under subgroup
2017-06-05T06:26:20+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2017-06-05T06:26:20+00:00

2eec0b73e8201761e9c350621651d2949dea52af

Before this change only last namespace in full path was extracted. It's
fine unless you have a link to submodule under subgroups. In that case
self_url? method returns false and link is processed as external. I
could not find a proper regex to cover all cases and correctly extract
full path to repository and instead used current instance host name
to get correct path to namespace and project.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





Before this change only last namespace in full path was extracted. It's
fine unless you have a link to submodule under subgroups. In that case
self_url? method returns false and link is processed as external. I
could not find a proper regex to cover all cases and correctly extract
full path to repository and instead used current instance host name
to get correct path to namespace and project.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







Enable the Style/PreferredHashMethods cop
2017-06-02T17:11:26+00:00

Rémy Coutable
remy@rymai.me

2017-06-02T17:11:26+00:00

4cfa5ce4a95379a9ebe08f57b170af4b5ee9a9a5

Signed-off-by: Rémy Coutable <remy@rymai.me>





Signed-off-by: Rémy Coutable <remy@rymai.me>







Fix up merge issues
2017-06-02T16:30:58+00:00

Luke "Jared" Bennett
lbennett@gitlab.com

2017-06-02T16:30:58+00:00

b2d577a7a293ac6c82a8bc64f5b134558460df5b












Merge remote-tracking branch 'origin/master' into fix-realtime-edited-text-for-issues-9-3
2017-06-02T16:17:54+00:00

Luke "Jared" Bennett
lbennett@gitlab.com

2017-06-02T16:17:54+00:00

5a4a08249055022e9e6e30d9ab38c45c1bf71842












Removed unneeded newline in issuables_helper_spec and removed unneeded updated_at_by variable in issuable_app_data
2017-06-02T09:27:53+00:00

Luke "Jared" Bennett
lbennett@gitlab.com

2017-06-02T09:27:53+00:00

e591401b0b3f08baf4cd28d0fcb8e184a515fc74












Show current user immediately in issuable filters
2017-06-02T07:42:18+00:00

Winnie Hellmann
winnie@gitlab.com

2017-06-02T07:42:18+00:00

f2b34fb208020706a5b5a73b2e50473bfda2c745