Commits · 67d06dcf5ccfbeb4465a2b8e3ea4a7b47c1b56e1 · nexedi / gitlab-ce

08 Oct, 2018 1 commit
- Merge branch 'ml-qa-geo-admin-menu-fix' into 'master' · 67d06dcf
  Rémy Coutable authored Oct 08, 2018
```
QA: Update EE admin menu selectors

See merge request gitlab-org/gitlab-ee!7820
```
  67d06dcf
07 Oct, 2018 3 commits
- Merge branch 'ce-to-ee-2018-10-06' into 'master' · e11f5a61
  Stan Hu authored Oct 07, 2018
```
CE upstream - 2018-10-06 21:38 UTC

See merge request gitlab-org/gitlab-ee!7829
```
  e11f5a61
- Merge branch 'epics-e2e-tests' into 'master' · 0b68db84
  Grzegorz Bizon authored Oct 07, 2018
```
Epics e2e tests Automation

Closes #7486 and #7470

See merge request gitlab-org/gitlab-ee!7381
```
  0b68db84
- Epics e2e tests Automation · d4c04d8e
  Ramya Authappan authored Oct 07, 2018
  
  d4c04d8e
06 Oct, 2018 36 commits
- Resolve again locale/gitlab.pot · 4ad21960
  André Luís authored Oct 07, 2018
  
  4ad21960
- Resolve locale/gitlab.pot · 70771e43
  André Luís authored Oct 06, 2018
  
  70771e43
- Resolve notes/components/noteable_note.vue · 5e412e2c
  André Luís authored Oct 06, 2018
  
  5e412e2c
- Resolve mr_notes/stores/index.js · aa998be8
  André Luís authored Oct 06, 2018
  
  aa998be8
- Update refresh_service.rb · 0d9f6abe
  Kamil Trzciński authored Oct 06, 2018
  
  0d9f6abe
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-06 · 2e57a920
  GitLab Bot authored Oct 06, 2018
```
# Conflicts:
#	app/assets/javascripts/mr_notes/stores/index.js
#	app/assets/javascripts/notes/components/noteable_note.vue
#	app/services/merge_requests/refresh_service.rb
#	locale/gitlab.pot

[ci skip]
```
  2e57a920
- Merge branch 'ce-to-ee-2018-10-06' into 'master' · c2584ae4
  Stan Hu authored Oct 06, 2018
```
CE upstream - 2018-10-06 00:21 UTC

Closes #2708, #2706, and #7545

See merge request gitlab-org/gitlab-ee!7825
```
  c2584ae4
- Merge branch 'bw-fix-checking-disabled-services' into 'master' · c3389c80
  Stan Hu authored Oct 06, 2018
```
Check disabled_services when finding a service

See merge request gitlab-org/gitlab-ce!22172
```
  c3389c80
- Remove flaky spec in spec/features/projects/jobs_spec.rb · c0199c8d
  Stan Hu authored Oct 06, 2018
```
This restores the changes in 1a90632c.
```
  c0199c8d
- Check disabled_services when finding a service · f934b216
  Brett Walker authored Oct 06, 2018
  
  f934b216
- Fix rubocop error · f6ff5265
  Brett Walker authored Oct 06, 2018
  
  f6ff5265
- Added spec to check for disabled services · 010461d9
  Brett Walker authored Oct 06, 2018
  
  010461d9
- Merge branch '52242-ui-ux-bug-in-change-group-path' into 'master' · 2fce6d6f
  Douglas Barbosa Alexandre authored Oct 06, 2018
```
Fix invalid parent path on group settings page

Closes #52242

See merge request gitlab-org/gitlab-ce!22142
```
  2fce6d6f
- Fix invalid parent path on group settings page · 75b2c9bf
  Dmitriy Zaporozhets authored Oct 06, 2018
  
  75b2c9bf
- Merge branch 'ce-1984-frontend-for-batch-comments' into 'master' · 4c351e17
  Tim Zallmann authored Oct 06, 2018
```
Backport CE changes for: [Frontend only] Batch comments on merge requests

See merge request gitlab-org/gitlab-ce!22158
```
  4c351e17
- Backport CE changes for: [Frontend only] Batch comments on merge requests · 8e5c0e68
  André Luís authored Oct 06, 2018
  
  8e5c0e68
- Merge branch '1984-frontend-for-batch-comments' into 'master' · dce97a1c
  Tim Zallmann authored Oct 06, 2018
```
[Frontend only] Batch comments on merge requests

See merge request gitlab-org/gitlab-ee!7376
```
  dce97a1c
- [Frontend only] Batch comments on merge requests · d79f8b1c
  André Luís authored Oct 06, 2018
  
  d79f8b1c
- Check disabled_services when finding a service · 87000ab7
  Brett Walker authored Oct 06, 2018
  
  87000ab7
- Merge branch 'add-button-to-insert-table-in-markdown' into 'master' · 54c442af
  Clement Ho authored Oct 06, 2018
```
Add button to insert table in markdown editor

See merge request gitlab-org/gitlab-ce!18480
```
  54c442af
- Add button to insert table in markdown editor · e9f7908f
  George Tsiolis authored Oct 06, 2018
  
  e9f7908f
- Merge branch '7125-refactor-code-quality-similar-to-junit-tests' into 'master' · 26f4a180
  Kamil Trzciński authored Oct 06, 2018
```
Resolve "Refactor code quality similar to JUnit tests"

Closes #7125

See merge request gitlab-org/gitlab-ee!7465
```
  26f4a180
- Resolve conflicts in spec/features/projects/jobs_spec.rb · ea307230
  Stan Hu authored Oct 06, 2018
  
  ea307230
- Resolve conflicts in app/models/system_note_metadata.rb · 2244d9ab
  Stan Hu authored Oct 06, 2018
  
  2244d9ab
- Resolve conflicts in app/models/note.rb · 2ae89a0b
  Stan Hu authored Oct 06, 2018
  
  2ae89a0b
- Resolve conflicts in app/services/ci/process_build_service.rb · 117ab089
  Stan Hu authored Oct 06, 2018
  
  117ab089
- Resolve conflicts in doc/api/README.md · e36e1c35
  Stan Hu authored Oct 06, 2018
  
  e36e1c35
- Resolve conflicts in spec/models/issue_spec.rb · 310d7d05
  Stan Hu authored Oct 06, 2018
  
  310d7d05
- Resolve conflicts in db/schema.rb · 79fa2b65
  Stan Hu authored Oct 06, 2018
  
  79fa2b65
- Resolve conflicts in app/models/issue.rb · 5a212732
  Stan Hu authored Oct 06, 2018
  
  5a212732
- Resolve conflicts in app/models/commit_status.rb · fc8de613
  Stan Hu authored Oct 06, 2018
  
  fc8de613
- Resolve conflicts in app/finders/template_finder.rb · e8f26adf
  Stan Hu authored Oct 06, 2018
  
  e8f26adf
- Resolve conflicts in app/finders/license_template_finder.rb · 5f2d7e11
  Stan Hu authored Oct 06, 2018
  
  5f2d7e11
- Resolve conflicts in... · 77568dc8
  Stan Hu authored Oct 06, 2018
```
Resolve conflicts in app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
```
  77568dc8
- Resolve conflicts in app/assets/javascripts/api.js · 3260863d
  Stan Hu authored Oct 06, 2018
  
  3260863d
- Merge branch 'gitaly-0.125.0' into 'master' · 50c9a09a
  Stan Hu authored Oct 06, 2018
```
Bump Gitaly to v0.125.0

See merge request gitlab-org/gitlab-ce!22168
```
  50c9a09a