Commits · aa5bfbc9af380fb5e916c2ca65dcef2e7cd020c5 · nexedi / gitlab-ce

09 Oct, 2017 35 commits
- Resolve conflict in .gitlab-ci.yml · aa5bfbc9
  Rémy Coutable authored Oct 09, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  aa5bfbc9
- Fix conflicts relating to models/project_services/chat_message/merge_message.rb · 61855dc1
  Stan Hu authored Oct 09, 2017
  
  61855dc1
- Resolve conflicts in git_user_default_ssh_config_check.rb · c4a2633b
  Toon Claes authored Oct 09, 2017
  
  c4a2633b
- Resolve CI/CD build related merge conflicts · b245f67c
  Alessio Caiazza authored Oct 09, 2017
  
  b245f67c
- CE->EE: Fix merge conflicts in lib/api/entities.rb · dd649aa9
  Nick Thomas authored Oct 09, 2017
  
  dd649aa9
- Fix conflicts in issue_warning_spec.js · 252c4855
  Sean McGivern authored Oct 09, 2017
  
  252c4855
- Resolve CI/CD pipeline related merge conflicts · c387f004
  Grzegorz Bizon authored Oct 09, 2017
  
  c387f004
- Fix conflicts for app/assets/javascripts/dispatcher.js · 56ae4a9a
  Filipa Lacerda authored Oct 09, 2017
  
  56ae4a9a
- Merge remote-tracking branch 'ce-com/master' into ce-to-ee · 1eb05471
  Dmitriy Zaporozhets authored Oct 09, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1eb05471
- Merge branch 'bvl-fork-network-migrations' into 'master' · f277fa14
  Yorick Peterse authored Oct 09, 2017
```
Create fork networks for root projects that are deleted

Closes #38905

See merge request gitlab-org/gitlab-ce!14752
```
  f277fa14
- Merge branch '37552-replace-js-true-with-js' into 'master' · 781d2c22
  Rémy Coutable authored Oct 09, 2017
```
Replaces `tag: true` into `:tag` in the specs

Closes #37552

See merge request gitlab-org/gitlab-ce!14653
```
  781d2c22
- Merge branch 'ce-to-ee-2017-10-05' into 'master' · 2d7b656f
  Rémy Coutable authored Oct 09, 2017
```
CE upstream: thursday

Closes gitlab-qa#73, #3611, gitaly#585, gitlab-ce#38417, gitlab-ce#38743, gitlab-ce#38315, gitlab-ce#38187 et gitlab-design#35

See merge request gitlab-org/gitlab-ee!3072
```
  2d7b656f
- Merge branch 'rc/do-not-retry-ee_compat_check' into 'master' · 1c0407e8
  Sean McGivern authored Oct 09, 2017
```
Do not retry jobs that are allowed to fail

See merge request gitlab-org/gitlab-ce!14757
```
  1c0407e8
- Merge branch 'icons-update-fix-regression-on-groups' into 'master' · 9f55733d
  Phil Hughes authored Oct 09, 2017
```
Updated Icons + Fix for Collapsed Groups Angle

See merge request gitlab-org/gitlab-ce!14754
```
  9f55733d
- Merge branch '38869-commitslist' into 'master' · c7865084
  Phil Hughes authored Oct 09, 2017
```
Removes CommitsList from global namespace

See merge request gitlab-org/gitlab-ce!14735
```
  c7865084
- Removes CommitsList from global namespace · 2597d8d2
  Filipa Lacerda authored Oct 09, 2017
  
  2597d8d2
- Merge branch 'jramsay-4012-improve-internationization-docs' into 'master' · 8af29c21
  Achilleas Pipinellis authored Oct 09, 2017
```
Improve internationalization docs

See merge request gitlab-org/gitlab-ce!14570
```
  8af29c21
- Merge branch 'abuse-reports-module' into 'master' · 705d0e35
  Filipa Lacerda authored Oct 09, 2017
```
Convert AbuseReports class to a module

See merge request gitlab-org/gitlab-ce!14709
```
  705d0e35
- Fix link to new i18n index page · 0e9c8862
  Achilleas Pipinellis authored Oct 09, 2017
  
  0e9c8862
- Update i18n docs · 5a25fc1e
  Achilleas Pipinellis authored Oct 09, 2017
  
  5a25fc1e
- CE->EE merge: fix failing specs in spec/models/project_spec.rb · 4f25ca25
  Nick Thomas authored Oct 09, 2017
  
  4f25ca25
- Move i18n/introduction to i18n/index · 75212fee
  Achilleas Pipinellis authored Oct 09, 2017
  
  75212fee
- Merge branch 'master' into jramsay-4012-improve-internationization-docs · 8a1f29de
  Achilleas Pipinellis authored Oct 09, 2017
  
  8a1f29de
- Merge branch '38840-simple-documentation-update-backup-to-restore-in-restore-section' into 'master' · 2a9147b7
  Achilleas Pipinellis authored Oct 09, 2017
```
Resolve "Simple documentation update - backup to restore in restore section"

Closes #38840

See merge request gitlab-org/gitlab-ce!14720
```
  2a9147b7
- Resolve "Simple documentation update - backup to restore in restore section" · 09dbbc27
  Alexander authored Oct 09, 2017
  
  09dbbc27
- Merge branch '28860-AjaxLoadingSpinner' into 'master' · 419b27eb
  Phil Hughes authored Oct 09, 2017
```
Remove AjaxLoadingSpinner and CreateLabelDropdown from global namespace

See merge request gitlab-org/gitlab-ce!14738
```
  419b27eb
- Remove AjaxLoadingSpinner and CreateLabelDropdown from global namespace · 7b814822
  Filipa Lacerda authored Oct 09, 2017
  
  7b814822
- Merge branch 'sh-fix-geo-transfer-tempfile' into 'master' · 1b77e3ec
  Nick Thomas authored Oct 09, 2017
```
Fix Geo transfers failure handling when filename too long

Closes #3682

See merge request gitlab-org/gitlab-ee!3095
```
  1b77e3ec
- Merge branch 'sh-show-all-slack-names' into 'master' · 1fd0668b
  Robert Speicher authored Oct 09, 2017
```
Include GitLab full name with username in Slack messages

Closes #38865

See merge request gitlab-org/gitlab-ce!14740
```
  1fd0668b
- Merge branch 'sh-pgloader-fixes' into 'master' · fbf10f33
  Achilleas Pipinellis authored Oct 09, 2017
```
Improve pgloader documentation

See merge request gitlab-org/gitlab-ce!14733
```
  fbf10f33
- Merge branch '10-1-improve-geo-documentation' into 'master' · 8011b689
  Achilleas Pipinellis authored Oct 09, 2017
```
Improved Geo development documentation with 10.0 and 10.1 changes.

See merge request gitlab-org/gitlab-ee!2978
```
  8011b689
- Merge branch '34371-ca-main-template' into 'master' · f45bb52a
  Phil Hughes authored Oct 09, 2017
```
Move cycle analytics banner into a vue file

See merge request gitlab-org/gitlab-ce!14690
```
  f45bb52a
- Move cycle analytics banner into a vue file · ccf31a13
  Filipa Lacerda authored Oct 09, 2017
  
  ccf31a13
- Updated Icons + Fix for Collapsed Groups Angle · b775fe7a
  Tim Zallmann authored Oct 06, 2017
  
  b775fe7a
- Don't create fork networks for root projects that are deleted · 392e5df7
  Bob Van Landuyt authored Oct 08, 2017
  
  392e5df7
08 Oct, 2017 3 commits
- Merge branch 'sh-remove-ux-chmod-permissions-ee' into 'master' · e004e6ba
  Achilleas Pipinellis authored Oct 08, 2017
```
Remove executable permissions on images to make docs lint happy

See merge request gitlab-org/gitlab-ee!3094
```
  e004e6ba
- Merge branch 'sh-remove-ux-chmod-permissions' into 'master' · 91f1d652
  Achilleas Pipinellis authored Oct 08, 2017
```
Remove executable permissions on images to make docs lint happy

See merge request gitlab-org/gitlab-ce!14750
```
  91f1d652
- Fix Geo transfers failure handling when filename too long · a3048ec8
  Stan Hu authored Oct 08, 2017
```
Improves existing log information as well.

Closes #3682
```
  a3048ec8
07 Oct, 2017 2 commits

Merge branch 'mk-clean-ldap-user-dns' into 'master' · 31a28bfb

Douwe Maan authored Oct 07, 2017

Normalize LDAP user DNs (downcase and remove excess spaces)

Closes #3151

See merge request gitlab-org/gitlab-ee!2942

31a28bfb

Merge branch 'bvl-fork-network-schema-ee' into 'master' · 45d063b7
Douwe Maan authored Oct 07, 2017
```
EE-port:  Create merge requests across a fork network

See merge request gitlab-org/gitlab-ee!3087
```
45d063b7