Commits · afb7260edc28e1f933fd69c800eb59094583cf18 · nexedi / gitlab-ce

26 Nov, 2018 35 commits
- Merge branch 'winh-issue-board-switcher-vue-ee' into 'master' · afb7260e
  Fatih Acet authored Nov 26, 2018
```
Refactor issue boards switcher to single file Vue component

See merge request gitlab-org/gitlab-ee!8519
```
  afb7260e
- Merge branch 'qa-193-ldap-group-sync' into 'master' · 5ec9214d
  Grzegorz Bizon authored Nov 26, 2018
```
E2E QA Tests - LDAP Admin user sync and Group sync with group cn and user filter

See merge request gitlab-org/gitlab-ee!8234
```
  5ec9214d
- Removed byebug file · 1e254c1b
  Sanad Liaquat authored Nov 20, 2018
  
  1e254c1b
- Add user to subgroup instead of sandbox. Some cleanup. · b52f27a9
  Sanad Liaquat authored Nov 20, 2018
  
  b52f27a9
- Fix user name typo · 1f5db25c
  Sanad Liaquat authored Nov 19, 2018
  
  1f5db25c
- Fix rubocop issue · 45be2a87
  Sanad Liaquat authored Nov 19, 2018
  
  45be2a87
- Use RestClient directly instead of airborne · 6897f206
  Sanad Liaquat authored Nov 19, 2018
  
  6897f206
- Updated to create group in sandbox and add users to sandbox as owners · f6e54708
  Sanad Liaquat authored Nov 16, 2018
  
  f6e54708
- Use admin access token · 02dc34ba
  Sanad Liaquat authored Nov 14, 2018
  
  02dc34ba
- Fix indenting pointed by Rubocop · 6ba6cfd0
  Sanad Liaquat authored Nov 14, 2018
  
  6ba6cfd0
- Revert changes login.rb. LDAP creds provided to runtime · 06ad460d
  Sanad Liaquat authored Nov 14, 2018
  
  06ad460d
- Admin sync test moved to another file · b9503293
  Sanad Liaquat authored Nov 13, 2018
  
  b9503293
- use .all? instead of reduce · 23ae4268
  Sanad Liaquat authored Nov 13, 2018
  
  23ae4268
- Increase wait time · fa190619
  Sanad Liaquat authored Nov 13, 2018
  
  fa190619
- Some refactoring done · 394746ff
  Sanad Liaquat authored Nov 13, 2018
  
  394746ff
- Now using API to create group · d85adbac
  Sanad Liaquat authored Nov 13, 2018
  
  d85adbac
- Fix unit tests · 588ff19a
  Sanad Liaquat authored Nov 12, 2018
  
  588ff19a
- Use RestClient with verify_ssl: false in api_fabricator · 4fad0ace
  Sanad Liaquat authored Nov 12, 2018
  
  4fad0ace
- use admin creds for api personal access token · 4b2569cb
  Sanad Liaquat authored Nov 12, 2018
  
  4b2569cb
- now creating users via api · 0932417d
  Sanad Liaquat authored Nov 12, 2018
  
  0932417d
- Modify Page::Component::Select2 to work with search and remove Select2Search · 77137a29
  Sanad Liaquat authored Nov 09, 2018
  
  77137a29
- Update spec description · 61a5199f
  Sanad Liaquat authored Nov 06, 2018
  
  61a5199f
- Uncomment setting group public visiblity · 169bf135
  Sanad Liaquat authored Nov 06, 2018
  
  169bf135
- Moved and removed a test · 3199d159
  Sanad Liaquat authored Nov 06, 2018
  
  3199d159
- Removed extra lines · b472f4c7
  Sanad Liaquat authored Nov 06, 2018
  
  b472f4c7
- Added admin test · ae532993
  Sanad Liaquat authored Nov 06, 2018
  
  ae532993
- Fix rubo cop issues · a225a849
  Sanad Liaquat authored Nov 06, 2018
  
  a225a849
- Added another test and some refactoring · 7483ed5b
  Sanad Liaquat authored Nov 06, 2018
  
  7483ed5b
- Resolve merge conflict and fix test · 810024a1
  Sanad Liaquat authored Nov 06, 2018
  
  810024a1
- Test is complete · f4c0abd5
  Sanad Liaquat authored Nov 05, 2018
  
  f4c0abd5
- Merge branch 'ce-to-ee-2018-11-26' into 'master' · 4ef33e00
  Steve Azzopardi authored Nov 26, 2018
```
CE upstream - 2018-11-26 05:21 UTC

See merge request gitlab-org/gitlab-ee!8581
```
  4ef33e00
- Resolve conflicts in doc/workflow/time_tracking.md · 50230815
  Steve Azzopardi authored Nov 26, 2018
```
Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23297
```
  50230815
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-26 · 2182cb4a
  GitLab Bot authored Nov 26, 2018
```
# Conflicts:
#	doc/workflow/time_tracking.md

[ci skip]
```
  2182cb4a
- Merge branch 'patch-32' into 'master' · 79ff6da3
  Evan Read authored Nov 26, 2018
```
Add month unit

See merge request gitlab-org/gitlab-ce!23297
```
  79ff6da3
- Merge branch 'docs-fix-badge' into 'master' · 425a37b4
  Evan Read authored Nov 26, 2018
```
Docs: Add security dashboard missing badge

See merge request gitlab-org/gitlab-ee!8575
```
  425a37b4
24 Nov, 2018 2 commits
- Merge branch 'ce-to-ee-2018-11-23' into 'master' · 2c519c97
  Stan Hu authored Nov 24, 2018
```
CE upstream - 2018-11-23 18:21 UTC

See merge request gitlab-org/gitlab-ee!8579
```
  2c519c97
- Run prettier on app/assets/javascripts/clusters/components/applications.vue · 4c991e83
  Stan Hu authored Nov 23, 2018
  
  4c991e83
23 Nov, 2018 3 commits
- Resolve conflicts in doc/README.md · b98a866c
  Stan Hu authored Nov 23, 2018
  
  b98a866c
- Merge branch '2122-add-loading-state' into 'master' · 97ce490f
  Phil Hughes authored Nov 23, 2018
```
Adds loading state to linked pipeline

See merge request gitlab-org/gitlab-ee!8572
```
  97ce490f
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-23 · 7e2bd2fb
  GitLab Bot authored Nov 23, 2018
```
# Conflicts:
#	doc/README.md

[ci skip]
```
  7e2bd2fb