Commits · 903fd3a07763a1549610f63c80eef99be2feed5e · nexedi / gitlab-ce

05 Mar, 2018 22 commits
- New translations gitlab.pot (French) · 903fd3a0
  GitLab Crowdin Bot authored Mar 05, 2018
  
  903fd3a0
- New translations gitlab.pot (Russian) · 842ae0d8
  GitLab Crowdin Bot authored Mar 05, 2018
  
  842ae0d8
- New translations gitlab.pot (Russian) · 71ebfcc8
  GitLab Crowdin Bot authored Mar 05, 2018
  
  71ebfcc8
- New translations gitlab.pot (Indonesian) · 21be4c7e
  GitLab Crowdin Bot authored Mar 05, 2018
  
  21be4c7e
- New translations gitlab.pot (Chinese Traditional) · 618e61d5
  GitLab Crowdin Bot authored Mar 05, 2018
  
  618e61d5
- New translations gitlab.pot (Chinese Traditional, Hong Kong) · 975fe035
  GitLab Crowdin Bot authored Mar 05, 2018
  
  975fe035
- New translations gitlab.pot (Dutch) · 8396983a
  GitLab Crowdin Bot authored Mar 05, 2018
  
  8396983a
- New translations gitlab.pot (Esperanto) · c6002461
  GitLab Crowdin Bot authored Mar 05, 2018
  
  c6002461
- New translations gitlab.pot (French) · 42818a23
  GitLab Crowdin Bot authored Mar 05, 2018
  
  42818a23
- New translations gitlab.pot (German) · 556d5378
  GitLab Crowdin Bot authored Mar 05, 2018
  
  556d5378
- New translations gitlab.pot (Italian) · dd6cded0
  GitLab Crowdin Bot authored Mar 05, 2018
  
  dd6cded0
- New translations gitlab.pot (Chinese Simplified) · 40b1c798
  GitLab Crowdin Bot authored Mar 05, 2018
  
  40b1c798
- New translations gitlab.pot (Japanese) · 52b5796a
  GitLab Crowdin Bot authored Mar 05, 2018
  
  52b5796a
- New translations gitlab.pot (Polish) · 558d2d85
  GitLab Crowdin Bot authored Mar 05, 2018
  
  558d2d85
- New translations gitlab.pot (Portuguese, Brazilian) · b69193e2
  GitLab Crowdin Bot authored Mar 05, 2018
  
  b69193e2
- New translations gitlab.pot (Russian) · b9038006
  GitLab Crowdin Bot authored Mar 05, 2018
  
  b9038006
- New translations gitlab.pot (Spanish) · 4369156d
  GitLab Crowdin Bot authored Mar 05, 2018
  
  4369156d
- New translations gitlab.pot (Ukrainian) · 393d3f9d
  GitLab Crowdin Bot authored Mar 05, 2018
  
  393d3f9d
- New translations gitlab.pot (Turkish) · 6c492927
  GitLab Crowdin Bot authored Mar 05, 2018
  
  6c492927
- New translations gitlab.pot (Filipino) · 23d544a9
  GitLab Crowdin Bot authored Mar 05, 2018
  
  23d544a9
- New translations gitlab.pot (Korean) · 4568e5b0
  GitLab Crowdin Bot authored Mar 05, 2018
  
  4568e5b0
- New translations gitlab.pot (Bulgarian) · 87635aba
  GitLab Crowdin Bot authored Mar 05, 2018
  
  87635aba
04 Mar, 2018 2 commits
- Merge branch 'ce-to-ee-2018-03-04' into 'master' · 74fc618d
  Stan Hu authored Mar 04, 2018
```
CE upstream - 2018-03-04 00:34 UTC

See merge request gitlab-org/gitlab-ee!4822
```
  74fc618d
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-04 · 98b1ee5a
  GitLab Bot authored Mar 04, 2018
  
  98b1ee5a
03 Mar, 2018 12 commits
- Merge branch 'patch-1' into 'master' · 8a0052c0
  Stan Hu authored Mar 03, 2018
```
Update proofreader.md

See merge request gitlab-org/gitlab-ce!17503
```
  8a0052c0
- Merge branch 'ce-to-ee-2018-03-03' into 'master' · 042bd26e
  James Lopez authored Mar 03, 2018
```
CE upstream - 2018-03-03 18:40 UTC

See merge request gitlab-org/gitlab-ee!4820
```
  042bd26e
- Merge branch '4848-fix-roadmap-tech-debt' into 'master' · 4d3cf166
  Filipa Lacerda authored Mar 03, 2018
```
Group Roadmap enhancements

Closes #5088

See merge request gitlab-org/gitlab-ee!4651
```
  4d3cf166
- Merge branch 'ide-fix-same-file-names' into 'master' · 4d74ba74
  Filipa Lacerda authored Mar 03, 2018
```
Fixed IDE file list when files have same name but different paths

Closes #5092

See merge request gitlab-org/gitlab-ee!4806
```
  4d74ba74
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-03 · b3e9967a
  GitLab Bot authored Mar 03, 2018
  
  b3e9967a
- Merge branch 'docs/spring-db-migration-error' into 'master' · 0a2a4ed0
  Yorick Peterse authored Mar 03, 2018
```
Add docs for persistent `ActiveRecord::PendingMigrationError` with Spring

See merge request gitlab-org/gitlab-ce!17473
```
  0a2a4ed0
- Update proofreader.md · 0bba60f5
  Filip Mech authored Mar 03, 2018
  
  0bba60f5
- Merge branch 'ce-to-ee-2018-03-02' into 'master' · 120fac8d
  Stan Hu authored Mar 03, 2018
```
CE upstream - 2018-03-02 21:24 UTC

See merge request gitlab-org/gitlab-ee!4816
```
  120fac8d
- Resolve conflicts in doc/user/project/issues/create_new_issue.md · 6b3de78d
  Stan Hu authored Mar 02, 2018
  
  6b3de78d
- Fix conflicts in doc/api/merge_requests.md · 5540e14b
  Stan Hu authored Mar 02, 2018
  
  5540e14b
- Resolve conflicts in doc/administration/index.md · 7192c58c
  Stan Hu authored Mar 02, 2018
  
  7192c58c
- Resolve conflicts in doc/administration/incoming_email.md · 44eab56e
  Stan Hu authored Mar 02, 2018
  
  44eab56e
02 Mar, 2018 4 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-02 · 92551e98
  GitLab Bot authored Mar 02, 2018
```
# Conflicts:
#	doc/administration/incoming_email.md
#	doc/administration/index.md
#	doc/api/merge_requests.md
#	doc/user/project/issues/create_new_issue.md
#	ee/app/assets/javascripts/protected_branches/index.js

[ci skip]
```
  92551e98
- Merge branch 'remove-mr-notes-bundle' into 'master' · 405c4cae
  Fatih Acet authored Mar 02, 2018
```
Remove mr_notes webpack bundle

See merge request gitlab-org/gitlab-ce!17497
```
  405c4cae
- Remove mr_notes webpack bundle · b342d2ae
  Mike Greiling authored Mar 02, 2018
  
  b342d2ae
- Merge branch 'remove-mr-notes-bundle-ee' into 'master' · 224c5a6a
  Fatih Acet authored Mar 02, 2018
```
EE Port of "Remove mr_notes webpack bundle"

See merge request gitlab-org/gitlab-ee!4815
```
  224c5a6a