delta/gitlab/gitlab-ce.git/spec/helpers, branch docs/trigger-script gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'master' into 'issue_38337' 2018-03-06T16:28:54+00:00 Felipe Artur fcardozo@gitlab.com 2018-03-06T16:28:54+00:00 e77c4e9efe0e19187929e5836cda5a3a59d0f89f # Conflicts: # app/models/group.rb # db/schema.rb 
# Conflicts:
#   app/models/group.rb
#   db/schema.rb
 Replace deprecated name_with_namespace with full_name in app and spec 2018-03-05T14:15:26+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2018-03-05T14:15:26+00:00 8fe9995f11010749c5fb183f2d8129f547ae6d4a Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Bring one group board to CE 2018-03-03T15:56:17+00:00 Felipe Artur felipefac@gmail.com 2018-02-19T19:06:16+00:00 dd071c4b6e9754a0abeec45ab2040d9e2d5a62b8 






Remove u2f webpack bundle
2018-03-01T18:13:50+00:00

Mike Greiling
mike@pixelcog.com

2018-03-01T18:13:50+00:00

d79df7baf7426ca865958b9a5fecb0690a6a6ba3












Merge branch '41255-refactoring-of-blob-link-methods-in-blob_helper' into 'master'
2018-02-26T15:03:21+00:00

Douwe Maan
douwe@gitlab.com

2018-02-26T15:03:21+00:00

2e59b4ea15f819d3b41140bf15a8e95a4a760cd3

Resolve "Refactoring of blob link methods in blob_helper"

Closes #41255

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




Resolve "Refactoring of blob link methods in blob_helper"

Closes #41255

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






Don't convert issuable_initial_data into JSON
2018-02-26T09:10:21+00:00

Jan Provaznik
jprovaznik@gitlab.com

2018-02-23T14:45:32+00:00

22addf26732e15bd63112c21f03a7f20c5feabc9

Instead of converting hash into JSON inside
issuable_initial_data method, return hash and convert
to JSON later. This allows us to easily extend basic
issuable data with resource specific values. For example
for Epic these data should include also labels, so we can then
do something like:
issuable_initial_data(@epic).merge(labels: @epic.labels).to_json





Instead of converting hash into JSON inside
issuable_initial_data method, return hash and convert
to JSON later. This allows us to easily extend basic
issuable data with resource specific values. For example
for Epic these data should include also labels, so we can then
do something like:
issuable_initial_data(@epic).merge(labels: @epic.labels).to_json







refactor methods inline
2018-02-23T15:52:18+00:00

James Lopez
james@jameslopez.es

2018-02-23T15:52:18+00:00

c888e73bc6bf7c89c551a45e579a3b319d435d21












refactor code based on feedback
2018-02-23T13:02:40+00:00

James Lopez
james@jameslopez.es

2018-02-22T12:54:19+00:00

0767861bcdc62cedf374c6a4b53d8526efb4ff58












some initial refactoring
2018-02-23T13:02:39+00:00

James Lopez
james@jameslopez.es

2018-02-15T07:53:09+00:00

bee837d7b5025a2e170dc0c857b188b4d89c014f












Merge branch 'bvl-external-auth-port' into 'master'
2018-02-23T09:14:14+00:00

Douwe Maan
douwe@gitlab.com

2018-02-23T09:14:14+00:00

f4bc6ec92e2af0b6cfd64f9ff0ca683bf62820d1

Port `read_cross_project` ability from EE

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




Port `read_cross_project` ability from EE

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