Commits · e4d8f6af7ffcebc17975c9ce9ac9f21744e69031 · nexedi / gitlab-ce

09 Aug, 2018 2 commits
- Update TOC in CONRTIBUTING.md and doc/development/contributing/ · e4d8f6af
  Rémy Coutable authored Aug 09, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e4d8f6af
- Improving Contributor On-Boarding Documentation · 381b594f
  Rémy Coutable authored Aug 09, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  381b594f
08 Aug, 2018 26 commits
- Merge branch 'ce-to-ee-2018-08-08' into 'master' · fffdce87
  Rémy Coutable authored Aug 08, 2018
```
CE upstream - 2018-08-08 09:23 UTC

See merge request gitlab-org/gitlab-ee!6835
```
  fffdce87
- Merge branch '6470-milestone-dates-integrated-into-epics' into 'master' · 8b3c1f38
  Sean McGivern authored Aug 08, 2018
```
Add date fields to Epic to enable dates to source from milestones

Closes #6470

See merge request gitlab-org/gitlab-ee!6448
```
  8b3c1f38
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-08 · 07e0f35a
  GitLab Bot authored Aug 08, 2018
  
  07e0f35a
- Merge branch 'ee-6336-add_snowplow_settings' into 'master' · e7ccc1f6
  Bob Van Landuyt authored Aug 08, 2018
```
Add Snowplow integration

See merge request gitlab-org/gitlab-ee!6642
```
  e7ccc1f6
- Add Snowplow integration · 166bdf04
  Imre Farkas authored Aug 08, 2018
  
  166bdf04
- Merge branch 'ce-to-ee-2018-08-08' into 'master' · f35a3c5b
  Julius Kvedaras authored Aug 08, 2018
```
CE upstream - 2018-08-08 07:57 UTC

See merge request gitlab-org/gitlab-ee!6833
```
  f35a3c5b
- Merge branch 'rename-security-products-team-label' into 'master' · 3bd4016b
  Marcia Ramos authored Aug 08, 2018
```
Update CONTRIBUTING.md

See merge request gitlab-org/gitlab-ce!21075
```
  3bd4016b
- Merge branch 'mg-keep-admin-settings-expanded' into 'master' · 6d01a65a
  Filipa Lacerda authored Aug 08, 2018
```
Keep admin settings sections expanded after submitting form

See merge request gitlab-org/gitlab-ee!6831
```
  6d01a65a
- Merge branch 'bvl-11-2-update-templates-licenses' into 'master' · 7c07a2b6
  Julius Kvedaras authored Aug 08, 2018
```
Update licenses and templates

See merge request gitlab-org/gitlab-ce!21084
```
  7c07a2b6
- Resolve conflicts in `app/assets/stylesheets/pages/profile.scss` · 33b71fa5
  Bob Van Landuyt authored Aug 08, 2018
  
  33b71fa5
- Merge branch 'sh-fix-oauth-link-to-message' into 'master' · 73d6633b
  Rémy Coutable authored Aug 08, 2018
```
Fix broken text in OAuth authorization screen

See merge request gitlab-org/gitlab-ce!21080
```
  73d6633b
- Merge branch 'ee-leipert-proper-gettext-parsing' into 'master' · c95d0c41
  Mike Greiling authored Aug 08, 2018
```
Frontend: Proper gettext extraction with gettext-extractor - EE

See merge request gitlab-org/gitlab-ee!6829
```
  c95d0c41
- Frontend: Proper gettext extraction with gettext-extractor - EE · 6ffdbe76
  Jose Ivan Vargas authored Aug 08, 2018
  
  6ffdbe76
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-08 · 999e8c22
  Bob Van Landuyt authored Aug 08, 2018
```
# Conflicts:
#	app/assets/stylesheets/pages/profile.scss

[ci skip]
```
  999e8c22
- update locale strings · 3d7f2dd1
  Mike Greiling authored Aug 08, 2018
  
  3d7f2dd1
- Merge branch 'ce-to-ee-2018-08-07' into 'master' · 3629550f
  Bob Van Landuyt authored Aug 08, 2018
```
CE upstream - 2018-08-07 18:21 UTC

Closes gitlab-org/quality/nightly#6 and gitlab-org/quality/team-tasks#36

See merge request gitlab-org/gitlab-ee!6826
```
  3629550f
- Update licenses · 51ce62b5
  Bob Van Landuyt authored Aug 08, 2018
  
  51ce62b5
- Update templates for 11.2 · 5ff3e937
  Bob Van Landuyt authored Aug 08, 2018
  
  5ff3e937
- ensure all ee-specific admin settings panels remain open after form submission · 7a924a95
  Mike Greiling authored Aug 08, 2018
  
  7a924a95
- fix bad copy/paste of slack settings description · 56a1d9d2
  Mike Greiling authored Aug 08, 2018
  
  56a1d9d2
- Fix broken text in OAuth authorization screen · 03483098
  Stan Hu authored Aug 07, 2018
  
  03483098
- Merge branch 'osw-update-api-docs-on-special-list-type-lists' into 'master' · b8fce8b2
  Victor Wu authored Aug 08, 2018
```
Update Issue boards and API docs regarding milestone and assignee lists

See merge request gitlab-org/gitlab-ee!6828
```
  b8fce8b2
- Merge branch 'tz-mr-port-memory-fixes' into 'master' · 42713252
  Mike Greiling authored Aug 08, 2018
```
Porting MR Vue Memory Fixes to current master

See merge request gitlab-org/gitlab-ce!21028
```
  42713252
- Porting MR Vue Memory Fixes to current master · 8daf9db6
  Tim Zallmann authored Aug 08, 2018
  
  8daf9db6
- Fix typo · db3677d5
  Victor Wu authored Aug 08, 2018
  
  db3677d5
- Sync mr_widget_options.vue to show test reports in mr widget. Fix redandant... · f0d8f093
  Shinya Maeda authored Aug 08, 2018
```
Sync mr_widget_options.vue to show test reports in mr widget. Fix redandant issue items from issues_list.vue
```
  f0d8f093
07 Aug, 2018 12 commits
- Merge branch '46703-group-dashboard-line-height-is-too-tall-for-group-names' into 'master' · b507d93a
  Fatih Acet authored Aug 07, 2018
```
Resolve "Group dashboard > Line height is too tall for group names"

Closes #46703 and #50064

See merge request gitlab-org/gitlab-ce!21033
```
  b507d93a
- Resolve "Group dashboard > Line height is too tall for group names" · 69f0daf7
  Adriel Santiago authored Aug 07, 2018
  
  69f0daf7
- Merge branch '35952-keep-project-cicd-settings-open-after-submit' into 'master' · 89b2df9b
  Tim Zallmann authored Aug 07, 2018
```
Keep project CI/CD settings sections expanded after submitting form

See merge request gitlab-org/gitlab-ce!21077
```
  89b2df9b
- Merge branch... · 0883e2ac
  Fatih Acet authored Aug 07, 2018
```
Merge branch '6766-performance-mr-widget-is-expandable-even-when-there-are-no-changes' into 'master'

Resolve "Performance MR widget is expandable even when there are no changes"

Closes #6766

See merge request gitlab-org/gitlab-ee!6685
```
  0883e2ac
- Merge branch '5621_usage_ping_for_security_products' into 'master' · 9d8235ed
  Robert Speicher authored Aug 07, 2018
```
Usage data for security products

Closes #5621

See merge request gitlab-org/gitlab-ee!6602
```
  9d8235ed
- Usage data for security products · 840e8556
  Gilbert Roulot authored Aug 07, 2018
  
  840e8556
- Hide Expand button on Performance MR Widget if no changes · 8df13b48
  Simon Knox authored Aug 03, 2018
  
  8df13b48
- Merge branch 'master' into ce-to-ee-2018-08-07 · c38626b1
  Jose Vargas authored Aug 07, 2018
  
  c38626b1
- Merge branch 'pl-json-gon' into 'master' · 861b16b5
  Tim Zallmann authored Aug 07, 2018
```
Don't set gon variables in JSON requests

See merge request gitlab-org/gitlab-ce!21016
```
  861b16b5
- Don't set gon variables in JSON requests · ffcf50c8
  Peter Leitzen authored Aug 07, 2018
  
  ffcf50c8
- keep pipeline triggers settings panel open after form submission · 50908fbe
  Mike Greiling authored Aug 07, 2018
  
  50908fbe
- keep cicd runner settings panel open after form submission · d1026e42
  Mike Greiling authored Aug 07, 2018
  
  d1026e42