Commits · c43d03da427dc2b98d4dfc797c0dbfe0f7a80576 · nexedi / gitlab-ce

10 Aug, 2017 11 commits

Fix wrong resolution of... · c43d03da

Rémy Coutable authored Aug 10, 2017

Fix wrong resolution of app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js

The wrong resoluation was from e2c085aa.
Signed-off-by: Rémy Coutable <remy@rymai.me>

c43d03da

Reorder gems in Gemfile.lock · 5d05e108
Rémy Coutable authored Aug 10, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
5d05e108
Fix a Rubocop offense · d9c4d575
Rémy Coutable authored Aug 10, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
d9c4d575
Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-08-09 · 64c495ef
Rémy Coutable authored Aug 10, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
64c495ef

Fix for spec/requests/api/boards_spec.rb · 40756592

Toon Claes authored Aug 09, 2017

In gitlab-org/gitlab-ce!13283 extra properties were added to
BasicProjectDetails. This entity is used by the Board entity and the
API boards spec verifies the JSON schema for the
`/projects/:id/boards` endpoint.

So add the extra properties to the schema file.

A better solution would have been to extract the project into a
separate file. But that is outside the current scope.

This also correctly fixes the conflict introduced in 3c8b2ae1, and
resolved in 55a5f2ab49.

40756592

Fix linters · 3cc7f46a
Jose Ivan Vargas authored Aug 08, 2017

3cc7f46a

Resolve conflict in app/views/shared/_import_form.html.haml · 2feec65a

Rémy Coutable authored Aug 10, 2017

Based on:

1. 0e85c50252dd43148488eacde57a882bd0b0a4ec
2. d19eaaed2d48e008abf94301a98e8ee806219071
3. 44c7f872219659d107fc01a62c8b5d6778ebbd74
Signed-off-by: Rémy Coutable <remy@rymai.me>

2feec65a

Resolve conflict in app/views/projects/tree/_tree_header.html.haml · 8ad25ce0
Rémy Coutable authored Aug 10, 2017
```
Based on d19eaaed2d48e008abf94301a98e8ee806219071.
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
8ad25ce0
Resolve conflict in app/views/projects/tree/_tree_content.html.haml · 5eae5f38
Rémy Coutable authored Aug 10, 2017
```
Based on d19eaaed2d48e008abf94301a98e8ee806219071.
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
5eae5f38
Resolve conflict in app/views/projects/jobs/_sidebar.html.haml · f386a01d
Rémy Coutable authored Aug 10, 2017
```
Based on d19eaaed2d48e008abf94301a98e8ee806219071.
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
f386a01d
Resolve conflicts in app/assets/stylesheets/pages/merge_requests.scss · c67cf9de
Rémy Coutable authored Aug 10, 2017
```
Based on 7d96866eddd7602be19effcce11a3568ed54666d.
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
c67cf9de

09 Aug, 2017 29 commits
- resolve mr widget conflicts · e2c085aa
  Simon Knox authored Aug 10, 2017
  
  e2c085aa
- Merge branch 'mk-add-opt-in-email-checkbox' into 'master' · 3d14c212
  Robert Speicher authored Aug 09, 2017
```
Add opt-in "I'd like to receive updates via email" checkbox

Closes #2447

See merge request !2623
```
  3d14c212
- fix conflicts in app/views/projects/jobs/_sidebar.html.haml · 4b8dd9b0
  Mike Greiling authored Aug 09, 2017
  
  4b8dd9b0
- Resolve conflict in db/schema.rb · 4c0d0dfa
  Rémy Coutable authored Aug 09, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  4c0d0dfa
- removed double import · c7a1773c
  Phil Hughes authored Aug 09, 2017
```
[ci skip]
```
  c7a1773c
- Resolve conflict in spec/initializers/6_validations_spec.rb · fef3c69e
  Rémy Coutable authored Aug 09, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  fef3c69e
- Resolve conflict in spec/features/merge_requests/closes_issues_spec.rb · 4245ab11
  Rémy Coutable authored Aug 09, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  4245ab11
- Resolve conflict in app/views/shared/issuable/_sidebar.html.haml · 8ec37f1c
  Rémy Coutable authored Aug 09, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  8ec37f1c
- Clean up EE overrides · d563c455
  Michael Kozono authored Aug 08, 2017
  
  d563c455
- Clean up specs · a1a17ac3
  Michael Kozono authored Aug 08, 2017
  
  a1a17ac3
- Fix spec and Rubocop failures · 4bcbc770
  Michael Kozono authored Aug 08, 2017
  
  4bcbc770
- Switch source to source_id · df206331
  Michael Kozono authored Aug 08, 2017
  
  df206331
- Fail if overridden CE methods are renamed · 84dd5610
  Michael Kozono authored Aug 08, 2017
  
  84dd5610
- Include all email opt-in data for marketo · 172f253a
  Michael Kozono authored Aug 08, 2017
  
  172f253a
- Capture email opt-in source and timestamp · 1012b1c2
  Michael Kozono authored Aug 07, 2017
  
  1012b1c2
- Include email_opted_in in system hooks user data · 72f8a090
  Michael Kozono authored Aug 07, 2017
  
  72f8a090
- Capture email opt-in IP · ac26518f
  Michael Kozono authored Aug 07, 2017
  
  ac26518f
- Save opted_in_to_emails checkbox on sign up · 4f0b3463
  Michael Kozono authored Aug 07, 2017
  
  4f0b3463
- Add “opted in to emails” user fields · 4885e789
  Michael Kozono authored Aug 07, 2017
  
  4885e789
- Resolve conflict in lib/gitlab/usage_data.rb · c2295e03
  Rémy Coutable authored Aug 09, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c2295e03
- Resolve conflict in app/assets/javascripts/api.js · b388b645
  Rémy Coutable authored Aug 09, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  b388b645
- Fix conflict in app/assets/javascripts/project_select.js · 0787f417
  Rémy Coutable authored Aug 09, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0787f417
- Resolve conflict in config/webpack.config.js · 23596a1b
  Rémy Coutable authored Aug 09, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  23596a1b
- Resolve conflicts in lib/api/entities.rb · 579da54f
  Rémy Coutable authored Aug 09, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  579da54f
- Resolve conflict in app/controllers/omniauth_callbacks_controller.rb · ff552fbd
  Rémy Coutable authored Aug 09, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  ff552fbd
- Resolve conflicts in app/models/repository.rb · 459145fa
  Rémy Coutable authored Aug 09, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  459145fa
- Resolve conflict in app/controllers/admin/health_check_controller.rb · 5f3caaf7
  Rémy Coutable authored Aug 09, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  5f3caaf7
- Resolve conflicts in app/models/merge_request.rb · d1cb1b2b
  Rémy Coutable authored Aug 09, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  d1cb1b2b
- Merge branch '36003-do-not-include-to-kernel-ee' into 'master' · 389dce86
  Robert Speicher authored Aug 09, 2017
```
EE: Don't include anything to Kernel only because of tasks

See merge request !2630
```
  389dce86