delta/gitlab/gitlab-ce.git, branch changes_tab_vue_refactoring gitlab.com: gitlab-org/gitlab-ce.git Expose note url 2018-03-27T15:34:05+00:00 Felipe Artur felipefac@gmail.com 2018-03-27T15:34:05+00:00 bc99cbddf9ef003ba18df3b7ed0aa348025e2009 






empty state for changes tab
2018-03-27T10:40:18+00:00

Simon Knox
psimyn@gmail.com

2018-03-27T10:40:18+00:00

e68d6da7429b6d4344488ced677e844783caae84












fix Hide Whitespace button
2018-03-27T10:24:41+00:00

Simon Knox
psimyn@gmail.com

2018-03-27T10:24:41+00:00

842a17976419842220e9528d8b43ee7fa157a33b












Merge branch 'changes_tab_vue_refactoring' of gitlab.com:gitlab-org/gitlab-ce into changes_tab_vue_refactoring
2018-03-27T08:15:49+00:00

Simon Knox
psimyn@gmail.com

2018-03-27T08:15:49+00:00

9cd5b8992e7ba048e77ca013dbc4e80830b4ef9a












fix diff file header layout
2018-03-27T07:51:10+00:00

Simon Knox
psimyn@gmail.com

2018-03-27T07:51:10+00:00

589e165a213015e39399813331adbf4035e77275












Merge branch '_mr-refector-review-target' of gitlab.com:gitlab-org/gitlab-ce into changes_tab_vue_refactoring
2018-03-26T20:08:34+00:00

Fatih Acet
acetfatih@gmail.com

2018-03-26T20:08:34+00:00

9db0a5d78fbc1b6deba109b3fc8a9ca38d4699a3

# Conflicts:
#	app/assets/javascripts/diffs/components/changed_files.vue
#	app/assets/javascripts/diffs/components/diff_file.vue
#	app/assets/javascripts/diffs/components/diff_line_gutter_content.vue
#	app/assets/javascripts/diffs/components/inline_diff_view.vue
#	app/assets/javascripts/diffs/components/parallel_diff_view.vue
#	app/assets/javascripts/diffs/constants.js
#	app/assets/javascripts/diffs/mixins/diff_content.js
#	app/assets/javascripts/diffs/store/actions.js
#	app/assets/javascripts/diffs/store/mutation_types.js
#	app/assets/javascripts/diffs/store/mutations.js
#	app/assets/javascripts/diffs/store/utils.js
#	app/assets/javascripts/mr_notes/index.js
#	app/assets/javascripts/mr_notes/stores/getters.js
#	app/assets/javascripts/notes.js
#	app/assets/javascripts/notes/components/diff_file_header.vue





# Conflicts:
#	app/assets/javascripts/diffs/components/changed_files.vue
#	app/assets/javascripts/diffs/components/diff_file.vue
#	app/assets/javascripts/diffs/components/diff_line_gutter_content.vue
#	app/assets/javascripts/diffs/components/inline_diff_view.vue
#	app/assets/javascripts/diffs/components/parallel_diff_view.vue
#	app/assets/javascripts/diffs/constants.js
#	app/assets/javascripts/diffs/mixins/diff_content.js
#	app/assets/javascripts/diffs/store/actions.js
#	app/assets/javascripts/diffs/store/mutation_types.js
#	app/assets/javascripts/diffs/store/mutations.js
#	app/assets/javascripts/diffs/store/utils.js
#	app/assets/javascripts/mr_notes/index.js
#	app/assets/javascripts/mr_notes/stores/getters.js
#	app/assets/javascripts/notes.js
#	app/assets/javascripts/notes/components/diff_file_header.vue







Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into _mr-refector-review-target
2018-03-26T19:56:37+00:00

Fatih Acet
acetfatih@gmail.com

2018-03-26T19:56:37+00:00

21ae60c6a841c3530571fecb330034912043d021

# Conflicts:
#	app/assets/javascripts/notes.js





# Conflicts:
#	app/assets/javascripts/notes.js







Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into changes_tab_vue_refactoring
2018-03-26T19:53:27+00:00

Fatih Acet
acetfatih@gmail.com

2018-03-26T19:53:27+00:00

b985a1d94a365249f3bfa8162ca19cc3399c59dc












Merge branch 'dz-improve-app-settings' into 'master'
2018-03-26T19:49:54+00:00

Filipa Lacerda
filipa@gitlab.com

2018-03-26T19:49:54+00:00

7c02d0cff3d79d9159b2966ce4807b71c4eff358

Redesign application settings to match project settings (part 1)

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




Redesign application settings to match project settings (part 1)

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






Merge branch '_mr-refactor-part-14' into '_mr-refector-review-target'
2018-03-26T19:45:37+00:00

Tim Zallmann
tzallmann@gitlab.com

2018-03-26T19:45:37+00:00

3401227dd3a8b5adb1bf23d3b99d25d2ad1011b5

MR Diffs Refactor Part 14: Inline and Parallel diff view components.

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




MR Diffs Refactor Part 14: Inline and Parallel diff view components.

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