Commits · 9468c9fcde2335005e31fe1fedb39f1e452f4933 · nexedi / gitlab-ce

11 Jan, 2018 40 commits
- 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
- fix conflict for /environments/components/environment_stop.vue [ci skip] · d61820cc
  Filipa Lacerda authored Jan 11, 2018
  
  d61820cc
- Fix conflicts for app/assets/javascripts/environments/components/environment_rollback.vue [ci skip] · 1dcb32d1
  Filipa Lacerda authored Jan 11, 2018
  
  1dcb32d1
- Fix conflicts for app/assets/javascripts/environments/components/environment_monitoring.vue · 78114e2f
  Filipa Lacerda authored Jan 11, 2018
  
  78114e2f
- Fix conflict for app/assets/javascripts/environments/components/environment_item.vue [ci skip] · ea6dc253
  Filipa Lacerda authored Jan 11, 2018
  
  ea6dc253
- Merge branch 'ce-to-ee-2018-01-11' of https://gitlab.com/gitlab-org/gitlab-ee... · 5a109128
  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
```
  5a109128
- Resolve mr_widget_pipeline · 103c7a0b
  Luke Bennett authored Jan 11, 2018
  
  103c7a0b
- Resolve sidebar_subscriptions · 4c1988b5
  Luke Bennett authored Jan 11, 2018
  
  4c1988b5
- Resolve lock_issue_sidebar · 3f5e3233
  Luke Bennett authored Jan 11, 2018
  
  3f5e3233
- Resolve edit_form · 3208a8c3
  Luke Bennett authored Jan 11, 2018
  
  3208a8c3
- Resolve confidential_issue_sidebar · 626a1468
  Luke Bennett authored Jan 11, 2018
  
  626a1468
- Resolve rable_registry · c4355197
  Luke Bennett authored Jan 11, 2018
  
  c4355197
- Fix conflicts app/assets/javascripts/environments/components/environment_external_url.vue [ci skip] · 3a817056
  Filipa Lacerda authored Jan 11, 2018
  
  3a817056
- Fix conflict app/assets/javascripts/environments/components/environment_actions.vue [ci skip] · c58f6180
  Filipa Lacerda authored Jan 11, 2018
  
  c58f6180
- Fix conflicts for... · 55a5ac70
  Filipa Lacerda authored Jan 11, 2018
```
Fix conflicts for app/assets/javascripts/cycle_analytics/components/stage_test_component.vue [ci skip]
```
  55a5ac70
- [ci skip] Fix conflict for... · 9b28613a
  Filipa Lacerda authored Jan 11, 2018
```
[ci skip] Fix conflict for app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue
```
  9b28613a
- Fix conflict for... · 726a5b67
  Filipa Lacerda authored Jan 11, 2018
```
Fix conflict for app/assets/javascripts/cycle_analytics/components/stage_review_component.vue [ci skip]
```
  726a5b67
- [ci skip] Fix conflict for... · aa08d9ce
  Filipa Lacerda authored Jan 11, 2018
```
[ci skip] Fix conflict for app/assets/javascripts/cycle_analytics/components/stage_plan_component.vue
```
  aa08d9ce
- Fix lint error by formatting block comments · 66eabecb
  Kushal Pandya authored Jan 11, 2018
  
  66eabecb
- Move modal dialog to app root component · 584149fa
  Kushal Pandya authored Jan 11, 2018
  
  584149fa