delta/gitlab/gitlab-ce.git/app/views/projects, branch refactor-environments-folder

Merge branch 'master' into refactor-environments-folder

2018-02-27T02:02:59+00:00

Resolve "Error 500 on route "/admin/application_settings/services/1882/edit" -> edit Prometheus Service Template"

2018-02-26T22:07:17+00:00

Remove environments folder webpack entry point

2018-02-26T21:44:03+00:00

Remove webpack bundle tags for blob

2018-02-26T17:27:42+00:00

Merge branch '41255-refactoring-of-blob-link-methods-in-blob_helper' into 'master'

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

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

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

Merge branch 'backport-qa_78' into 'master'

2018-02-25T07:58:23+00:00

QA BACKPORT - Test merge request rebase

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

Merge branch 'project-deploy-keys-bundle-tag-refactor' into 'master'

2018-02-23T20:07:02+00:00

Refactored webpack bundle tag for deploy keys

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

Removed webpack tag

2018-02-23T19:01:56+00:00

Merge branch 'remove-issues-show' into 'master'

2018-02-23T18:50:20+00:00

Remove issue_show webpack bundle

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