Commits · 55bc776456b29dd9e0bbf8be33f254f275c773cf · nexedi / gitlab-ce

11 Jan, 2018 40 commits
- Remove merge conflict markers · 55bc7764
  Achilleas Pipinellis authored Jan 11, 2018
  
  55bc7764
- Merge branch 'ce-to-ee-2018-01-11' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee-2018-01-11 · cd1dbd94
  Eric Eastwood authored Jan 11, 2018
  
  cd1dbd94
- Remove duplicated conflict resolution code to fix eslint · 81aed4cc
  Eric Eastwood authored Jan 11, 2018
  
  81aed4cc
- Fix settings_panel.vue · 992476fa
  Luke Bennett authored Jan 11, 2018
  
  992476fa
- Resolve header_ci_component.vue · 581fe77b
  Luke Bennett authored Jan 11, 2018
  
  581fe77b
- Resolve yarn.lock · 34aae2de
  Luke Bennett authored Jan 11, 2018
  
  34aae2de
- Resolve index.md · 3b2148a9
  Luke Bennett authored Jan 11, 2018
  
  3b2148a9
- Solved features/support/env.rb · 75cacd70
  Jose Ivan Vargas authored Jan 11, 2018
  
  75cacd70
- Resolve index.md · 11f44676
  Luke Bennett authored Jan 11, 2018
  
  11f44676
- Resolve dispatcher.js · 02c6fb74
  Luke Bennett authored Jan 11, 2018
  
  02c6fb74
- Fix conflict for yarn.lock [ci skici skip] · 403b9464
  Filipa Lacerda authored Jan 11, 2018
  
  403b9464
- Fix conflicts for doc/development/fe_guide/style_guide_js.md · df46e511
  Filipa Lacerda authored Jan 11, 2018
  
  df46e511
- Fix conflict for app/assets/javascripts/ide/components/repo_tab.vue · 79c2640b
  Filipa Lacerda authored Jan 11, 2018
  
  79c2640b
- fix conflicts for · bbd0c488
  Filipa Lacerda authored Jan 11, 2018
```
  app/assets/javascripts/environments/components/environment_item.vue
  app/assets/javascripts/environments/components/environment_actions.vue
[ci skip]
```
  bbd0c488
- [ci skip] Fix conflict for app/assets/javascripts/issue_show/components/app.vue · d4aa2fd2
  Filipa Lacerda authored Jan 11, 2018
  
  d4aa2fd2
- [ci skip] Fix conflict for app/assets/javascripts/ide/components/repo_editor.vue · 432e276c
  Filipa Lacerda authored Jan 11, 2018
  
  432e276c
- [ci skip] Fix conflict for app/assets/javascripts/ide/components/repo_preview.vue · edb42941
  Filipa Lacerda authored Jan 11, 2018
  
  edb42941
- [ci skip] Fix conflict for app/assets/javascripts/ide/components/ide_side_bar.vue · 6665d3c8
  Filipa Lacerda authored Jan 11, 2018
  
  6665d3c8
- [ci skip] Fix conflict for app/assets/javascripts/ide/components/ide_project_branches_tree.vue · abdf5f38
  Filipa Lacerda authored Jan 11, 2018
  
  abdf5f38
- Solved db/schema.rb · 9468c9fc
  Jose Ivan Vargas authored Jan 11, 2018
  
  9468c9fc
- Resolve issue_show app · f29ed174
  Luke Bennett authored Jan 11, 2018
  
  f29ed174
- Resolve markdown · 93b95eac
  Luke Bennett authored Jan 11, 2018
  
  93b95eac
- Merge branch 'ce-to-ee-2018-01-11' of https://gitlab.com/gitlab-org/gitlab-ee... · 7f5422f3
  Luke Bennett authored Jan 11, 2018
```
Merge branch 'ce-to-ee-2018-01-11' of https://gitlab.com/gitlab-org/gitlab-ee into ce-to-ee-2018-01-11
```
  7f5422f3
- Resolve noteable_note · 01bfddc5
  Luke Bennett authored Jan 11, 2018
  
  01bfddc5
- Resolve note_form · 90944c7f
  Luke Bennett authored Jan 11, 2018
  
  90944c7f
- Resolve note_attachment · 238be2d4
  Luke Bennett authored Jan 11, 2018
  
  238be2d4
- Resolve comment_form · fa5ff2cc
  Luke Bennett authored Jan 11, 2018
  
  fa5ff2cc
- Solved monitoring components conflicts · 15ff8c1d
  Jose Ivan Vargas authored Jan 11, 2018
  
  15ff8c1d
- Merge branch 'ce-to-ee-2018-01-11' of https://gitlab.com/gitlab-org/gitlab-ee... · 0fed2ce1
  Luke Bennett authored Jan 11, 2018
```
Merge branch 'ce-to-ee-2018-01-11' of https://gitlab.com/gitlab-org/gitlab-ee into ce-to-ee-2018-01-11
```
  0fed2ce1
- Resolve settings_panel · f86e0d6e
  Luke Bennett authored Jan 11, 2018
  
  f86e0d6e
- Resolve stage_column_component · f32caec4
  Luke Bennett authored Jan 11, 2018
  
  f32caec4
- Resolve graph_component · 57196cc7
  Luke Bennett authored Jan 11, 2018
  
  57196cc7
- Resolve action_component · c42c4d2e
  Luke Bennett authored Jan 11, 2018
  
  c42c4d2e
- Resolve stage · 8ca82922
  Luke Bennett authored Jan 11, 2018
  
  8ca82922
- Resolve pipelines_table_row · 327574c9
  Luke Bennett authored Jan 11, 2018
  
  327574c9
- Resolve header_component · c9a29d3e
  Luke Bennett authored Jan 11, 2018
  
  c9a29d3e
- Resolve async_button · 1f159a9f
  Luke Bennett authored Jan 11, 2018
  
  1f159a9f
- Fix conflict app/assets/javascripts/environments/folder/environments_folder_view.vue · ced89e04
  Filipa Lacerda authored Jan 11, 2018
  
  ced89e04
- Fix conflict for app/assets/javascripts/environments/components/environments_table.vue [ci skip] · b5cfb40c
  Filipa Lacerda authored Jan 11, 2018
  
  b5cfb40c
- [ci skip] Fix conflicts for... · 44b69737
  Filipa Lacerda authored Jan 11, 2018
```
[ci skip] Fix conflicts for app/assets/javascripts/environments/components/environment_terminal_button.vue
```
  44b69737