Commits · 32620938abf72a08eb4adf603c815e67afc372a3 · nexedi / gitlab-ce · GitLab

10 Oct, 2017 24 commits
- Use :js instead of js: true for spec · 32620938
  Dmitriy Zaporozhets authored Oct 10, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  32620938
- Fix syntax error in app/assets/stylesheets/pages/boards.scss · ff6eb578
  Dmitriy Zaporozhets authored Oct 10, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ff6eb578
- Resolve conflict in app/views/projects/_md_preview.html.haml · f78d27be
  Dmitriy Zaporozhets authored Oct 10, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f78d27be
- Resolve conflict in app/assets/javascripts/vue_shared/components/issue/issue_warning.vue · a7e7469b
  Dmitriy Zaporozhets authored Oct 10, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a7e7469b
- Resolve conflict in app/assets/stylesheets/pages/note_form.scss · 6ee56e2b
  Dmitriy Zaporozhets authored Oct 10, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6ee56e2b
- Resolve conflict in app/assets/stylesheets/framework/variables.scss · 0f0dd277
  Dmitriy Zaporozhets authored Oct 10, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0f0dd277
- Resolve conflict in spec/lib/gitlab/git_access_spec.rb · c1401cbf
  Dmitriy Zaporozhets authored Oct 10, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c1401cbf
- Resolve conflicts in merge_requests/show.html.haml_spec.rb · aa583731
  Bob Van Landuyt authored Oct 10, 2017
  
  aa583731
- Resolve conflicts in spec/services/projects/update_service_spec.rb · 4a5df964
  Bob Van Landuyt authored Oct 10, 2017
  
  4a5df964
- Fix conflicts in spec/services/merge_requests · da2645fd
  Bob Van Landuyt authored Oct 10, 2017
  
  da2645fd
- Resolve conflicts in spec/models/namespace_spec.rb · 93f60bad
  Bob Van Landuyt authored Oct 10, 2017
  
  93f60bad
- Resolve conflicts in spec/models/forked_project_link_spec.rb · 3801b851
  Bob Van Landuyt authored Oct 10, 2017
  
  3801b851
- Fix conflicts in spec/lib/gitlab/import_export/all_models.yml · e242ce30
  Bob Van Landuyt authored Oct 10, 2017
  
  e242ce30
- Fix conflicts in spec/features/projects_spec.rb · a40272f4
  Bob Van Landuyt authored Oct 10, 2017
  
  a40272f4
- Fix conflicts in spec/features/projects/user_uploads_files_spec.rb · 3debb35e
  Bob Van Landuyt authored Oct 10, 2017
  
  3debb35e
- Resolve conflicts spec/features/projects/issuable_templates_spec.rb · e37491ca
  Bob Van Landuyt authored Oct 10, 2017
  
  e37491ca
- Resolve conflicts in spec/features/merge_requests/diffs_spec.rb · 37d9b327
  Bob Van Landuyt authored Oct 10, 2017
  
  37d9b327
- Resolve conflicts in fork network background migrations · ebedb7ee
  Bob Van Landuyt authored Oct 10, 2017
  
  ebedb7ee
- Resolve conflicts in features/support/env.rb · 5ee0a056
  Bob Van Landuyt authored Oct 10, 2017
  
  5ee0a056
- Resolve conflicts in app/views/projects/_home_panel.html.haml · 6c77c0ff
  Bob Van Landuyt authored Oct 10, 2017
  
  6c77c0ff
- Merge branch 'ce-to-ee' of https://gitlab.com/gitlab-org/gitlab-ee into ce-to-ee · 290285d2
  Shinya Maeda authored Oct 10, 2017
  
  290285d2
- Fix confclits related to https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3083 · b2a60a2f
  Shinya Maeda authored Oct 10, 2017
  
  b2a60a2f
- Resolve conflicts in spec/support/project_forks_helper.rb · 25fe0ae8
  Bob Van Landuyt authored Oct 10, 2017
  
  25fe0ae8
- Resolve conflicts in spec/features/projects/merge_requests/user_creates_merge_request_spec.rb · cfe12a0d
  blackst0ne authored Oct 10, 2017
  
  cfe12a0d
09 Oct, 2017 16 commits
- Solved conflicts protected_branches_spec · 23f869c7
  Jose Ivan Vargas authored Oct 09, 2017
  
  23f869c7
- Resolve conflicts in app/models/merge_request.rb · b0fcdeff
  Stan Hu authored Oct 09, 2017
  
  b0fcdeff
- Resolve conflicts in lib/api/merge_requests.rb · e55b2cd1
  Stan Hu authored Oct 09, 2017
  
  e55b2cd1
- Resolve docs conflicts · 6af99066
  Achilleas Pipinellis authored Oct 09, 2017
```
[ci skip]
```
  6af99066
- Merge branch 'ce-to-ee' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee · 13f9d700
  Felipe Artur authored Oct 09, 2017
  
  13f9d700
- Resolve text_env.rb conflict · 88886eaf
  Felipe Artur authored Oct 09, 2017
  
  88886eaf
- resolve some conflicts · 3037be1f
  Jarka Kadlecova authored Oct 09, 2017
  
  3037be1f
- Resolve conflicts with doc/update/mysql_to_postgresql.md · c729b06a
  Stan Hu authored Oct 09, 2017
  
  c729b06a
- Fix navigation conflicts · 2ab289f6
  Annabel Dunstone Gray authored Oct 09, 2017
  
  2ab289f6
- Resolve conflict in .gitlab-ci.yml · aa5bfbc9
  Rémy Coutable authored Oct 09, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  aa5bfbc9
- Fix conflicts relating to models/project_services/chat_message/merge_message.rb · 61855dc1
  Stan Hu authored Oct 09, 2017
  
  61855dc1
- Resolve conflicts in git_user_default_ssh_config_check.rb · c4a2633b
  Toon Claes authored Oct 09, 2017
  
  c4a2633b
- Resolve CI/CD build related merge conflicts · b245f67c
  Alessio Caiazza authored Oct 09, 2017
  
  b245f67c
- CE->EE: Fix merge conflicts in lib/api/entities.rb · dd649aa9
  Nick Thomas authored Oct 09, 2017
  
  dd649aa9
- Fix conflicts in issue_warning_spec.js · 252c4855
  Sean McGivern authored Oct 09, 2017
  
  252c4855
- Resolve CI/CD pipeline related merge conflicts · c387f004
  Grzegorz Bizon authored Oct 09, 2017
  
  c387f004