Commits · aaa50474f7a88eb8afb0b20b9275c3e56c34880f · nexedi / gitlab-ce · GitLab

25 May, 2018 40 commits
- Fix conflict in app/views/admin/users/_form.html.haml · aaa50474
  Clement Ho authored May 25, 2018
  
  aaa50474
- Fix conflict in app/views/admin/requests_profiles/index.html.haml · 62a794c1
  Clement Ho authored May 25, 2018
  
  62a794c1
- Fix conflict in app/views/admin/projects/show.html.haml · 913bdd85
  Clement Ho authored May 25, 2018
  
  913bdd85
- Fix conflict in app/views/admin/labels/_form.html.haml · 210c24a7
  Clement Ho authored May 25, 2018
  
  210c24a7
- Fix conflict in app/views/admin/identities/_form.html.haml · e5e18018
  Clement Ho authored May 25, 2018
  
  e5e18018
- Fix conflict in app/views/admin/groups/show.html.haml · 44d8c684
  Clement Ho authored May 25, 2018
  
  44d8c684
- Fix conflict in app/views/admin/groups/_form.html.haml · b4f738c0
  Clement Ho authored May 25, 2018
  
  b4f738c0
- Fix conflict in app/views/admin/conversational_development_index/show.html.haml · b30bc118
  Clement Ho authored May 25, 2018
  
  b30bc118
- Fix conflict in app/views/admin/broadcast_messages/_form.html.haml · 56bcaf86
  Clement Ho authored May 25, 2018
  
  56bcaf86
- Fix conflict in app/views/admin/application_settings/_visibility_and_access.html.haml · 16e4fc45
  Clement Ho authored May 25, 2018
  
  16e4fc45
- Fix conflict in app/views/admin/application_settings/_signin.html.haml · c672b43a
  Clement Ho authored May 25, 2018
  
  c672b43a
- Fix conflict in app/views/admin/application_settings/_help_page.html.haml · de6d43f7
  Clement Ho authored May 25, 2018
  
  de6d43f7
- Fix conflict in app/views/admin/application_settings/_ci_cd.html.haml · 8a999fd1
  Clement Ho authored May 25, 2018
  
  8a999fd1
- Fix conflict in app/views/admin/application_settings/_account_and_limit.html.haml · a385c45d
  Clement Ho authored May 25, 2018
  
  a385c45d
- Fix conflict in app/views/admin/appearances/_form.html.haml · df0cd020
  Clement Ho authored May 25, 2018
  
  df0cd020
- Fix conflict in app/views/admin/abuse_reports/_abuse_report.html.haml · 89e21c91
  Clement Ho authored May 25, 2018
  
  89e21c91
- Fix conflict in app/views/abuse_reports/new.html.haml · dd0052bf
  Clement Ho authored May 25, 2018
  
  dd0052bf
- Fix conflict in app/assets/stylesheets/pages/settings.scss · 1bb97947
  Clement Ho authored May 25, 2018
  
  1bb97947
- Fix conflict in app/assets/stylesheets/pages/milestone.scss · 98b65176
  Clement Ho authored May 25, 2018
  
  98b65176
- Fix conflict in app/assets/stylesheets/pages/merge_requests.scss · 54f2ca24
  Clement Ho authored May 25, 2018
  
  54f2ca24
- Fix conflict in app/assets/stylesheets/pages/members.scss · 2c507fc0
  Clement Ho authored May 25, 2018
  
  2c507fc0
- Fix conflict in app/assets/stylesheets/pages/issues.scss · c3fa2413
  Clement Ho authored May 25, 2018
  
  c3fa2413
- Fix conflict in app/assets/stylesheets/pages/groups.scss · 4553453f
  Clement Ho authored May 25, 2018
  
  4553453f
- Fix conflict in app/assets/stylesheets/pages/editor.scss · cbd02c6b
  Clement Ho authored May 25, 2018
  
  cbd02c6b
- Fix conflict in app/assets/stylesheets/pages/cycle_analytics.scss · 9fc1229e
  Clement Ho authored May 25, 2018
  
  9fc1229e
- Fix conflict in app/assets/stylesheets/pages/builds.scss · c52f9ec1
  Clement Ho authored May 25, 2018
  
  c52f9ec1
- Fix conflict in app/assets/stylesheets/framework/panels.scss · 64c946ea
  Clement Ho authored May 25, 2018
  
  64c946ea
- Fix conflict in app/assets/stylesheets/framework/dropdowns.scss · 7d21a109
  Clement Ho authored May 25, 2018
  
  7d21a109
- Fix conflict in... · 663ac1aa
  Clement Ho authored May 25, 2018
```
Fix conflict in app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue
```
  663ac1aa
- Fix conflict in app/assets/javascripts/jobs/components/sidebar_details_block.vue · 13da5980
  Clement Ho authored May 25, 2018
  
  13da5980
- Fix conflict in app/assets/javascripts/ide/components/new_dropdown/modal.vue · 9061653d
  Clement Ho authored May 25, 2018
  
  9061653d
- Fix conflict in app/assets/javascripts/boards/components/modal/empty_state.js · cca3f97e
  Clement Ho authored May 25, 2018
  
  cca3f97e
- Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee-bootstrap4 · 78c12922
  Clement Ho authored May 25, 2018
  
  78c12922
- Merge branch 'winh-new-merge-request-encoding' into 'master' · 50c8ed2b
  Mike Greiling authored May 25, 2018
```
Fix encoding of branch names on compare and new merge request page

Closes #46627

See merge request gitlab-org/gitlab-ce!19143
```
  50c8ed2b
- Merge branch 'bootstrap4' into 'master' · 74894a38
  Mike Greiling authored May 25, 2018
```
Upgrade to Bootstrap 4

Closes #45185 and #46710

See merge request gitlab-org/gitlab-ce!18232
```
  74894a38
- Merge branch 'ee-bootstrap4' into 'master' · aeed5f36
  Mike Greiling authored May 25, 2018
```
Upgrade to Bootstrap 4 (EE)

Closes #5767

See merge request gitlab-org/gitlab-ee!5474
```
  aeed5f36
- Upgrade to Bootstrap 4 (EE) · 4c982055
  Clement Ho authored May 25, 2018
  
  4c982055
- Fix indentation in user_selects_branches_for_new_mr_spec.rb · 0fb4239a
  Winnie Hellmann authored May 25, 2018
  
  0fb4239a
- Merge branch 'ce-to-ee-2018-05-25' into 'master' · 16a757a7
  Stan Hu authored May 25, 2018
```
CE upstream - 2018-05-25 18:23 UTC

See merge request gitlab-org/gitlab-ee!5857
```
  16a757a7
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-25 · 5f043540
  GitLab Bot authored May 25, 2018
  
  5f043540