Commits · 3c197e74827b99a524a70f05fb4e955a036172b5 · nexedi / gitlab-ce

13 Jul, 2017 1 commit

Robert Speicher authored Jul 13, 2017

Merge branch '34780-restricted-visibility-levels-in-admin-application-settings-looks-off' into 'master'

Fix wrong helper used for adding context for translations.

Closes #34780

See merge request !12731

3c197e74

12 Jul, 2017 36 commits
- Merge branch 'enable-scss-lint-declaration-order' into 'master' · a2961a1c
  Clement Ho authored Jul 12, 2017
```
Enable DeclarationOrder in scss-lint

See merge request !12805
```
  a2961a1c
- Merge branch 'enable-scss-lint-bang-format' into 'master' · 04f9552d
  Clement Ho authored Jul 12, 2017
```
Enable BangFormat in scss-lint

See merge request !12815
```
  04f9552d
- Fix wrong helper used for adding context for translations. · a90ca93c
  Ruben Davila authored Jul 12, 2017
```
Additionally some missing translations were added
```
  a90ca93c
- Merge branch 'gitlab-shell-5-3-1' into 'master' · af713ce7
  Stan Hu authored Jul 12, 2017
```
Update gitlab-shell to v5.3.1

Closes gitlab-shell#92

See merge request !12817
```
  af713ce7
- Merge branch 'migrate-workhorse-send-blob-to-gitaly' into 'master' · 9bfe49c2
  Robert Speicher authored Jul 12, 2017
```
Migrate Workhorse SendBlob to Gitaly

Closes gitaly#356

See merge request !12313
```
  9bfe49c2
- Merge branch 'mr-branch-link-use-tree' into 'master' · 777ec210
  Robert Speicher authored Jul 12, 2017
```
MR branch link now links to tree instead of commits

Closes #34243

See merge request !12763
```
  777ec210
- Merge branch 'backport-ee-2405' into 'master' · bc1bb506
  Douwe Maan authored Jul 12, 2017
```
Backport "Automatically link Kerberos users and LDAP people" changes to CE

See merge request !12807
```
  bc1bb506
- Merge branch '34797_add_italian_translations_of_pipeline_charts' into 'master' · 92949e05
  Douwe Maan authored Jul 12, 2017
```
Add Italian translations of Pipeline Charts

Closes #34797

See merge request !12700
```
  92949e05
- Deep link · a2030dc1
  Sid Sijbrandij authored Jul 12, 2017
  
  a2030dc1
- Update gitlab-shell to v5.3.1 · c718d7fa
  Sean McGivern authored Jul 12, 2017
```
This fixes an issue where the merge request URLs for a push returned an error,
which made gitlab-shell show a stacktrace to the user.
```
  c718d7fa
- Merge branch 'enable-scss-lint-unnecessary-parent-reference' into 'master' · 3bce3014
  Clement Ho authored Jul 12, 2017
```
Enable UnnecessaryParentReference in scss-lint

See merge request !12738
```
  3bce3014
- Fix spec name grammer · 531157f5
  Clement Ho authored Jul 12, 2017
  
  531157f5
- Enable BangFormat in scss-lint · 2baef395
  Takuya Noguchi authored Jul 12, 2017
  
  2baef395
- Merge branch '34534-update-vue-resource' into 'master' · 7fb7acd7
  Phil Hughes authored Jul 12, 2017
```
Update vue-resource

Closes #34534

See merge request !12658
```
  7fb7acd7
- Update vue-resource · aaa78199
  Filipa Lacerda authored Jul 12, 2017
  
  aaa78199
- Merge branch 'bugfix-htmlenc' into 'master' · fd692d10
  Sean McGivern authored Jul 12, 2017
```
decode user/namespace names before display

See merge request !10085
```
  fd692d10
- Merge branch... · 61ec2f30
  Rémy Coutable authored Jul 12, 2017
```
Merge branch '34792_add_traditional_chinese_in_taiwan_translations_of_pipeline_charts' into 'master'

Add Traditional Chinese in Taiwan translations of Pipeline Charts

Closes #34792

See merge request !12697
```
  61ec2f30
- Merge branch 'replace_spinach_spec_browse_files' into 'master' · b9522020
  Rémy Coutable authored Jul 12, 2017
```
Replace 'browse_files.feature' spinach test with an rspec analog

See merge request !12251
```
  b9522020
- Stop sanitizing user 'name' when inserting into db · 4f47de62
  Nathan Neulinger authored Apr 10, 2017
```
Add spec tests for encoding
```
  4f47de62
- Replace 'browse_files.feature' spinach test with an rspec analog · 2c8700c0
  blackst0ne authored Jul 12, 2017
  
  2c8700c0
- Merge branch '34325-reinstate-is_admin-for-user-api' into 'master' · 571c4f5a
  Sean McGivern authored Jul 12, 2017
```
Return `is_admin` attribute in the GET /user endpoint for admins

Closes #34325

See merge request !12811
```
  571c4f5a
- Return `is_admin` attribute in the GET /user endpoint for admins · 91f63820
  Rémy Coutable authored Jul 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  91f63820
- Merge branch '34978-remove-public-ci-favicon-ico' into 'master' · f5f94200
  Rémy Coutable authored Jul 12, 2017
```
Remove public/ci/favicon.ico

Closes #34978

See merge request !12803
```
  f5f94200
- Merge branch '34858-bump-scss-lint-to-0-54-0' into 'master' · 7a7b0cc1
  Rémy Coutable authored Jul 12, 2017
```
Bump scss-lint to 0.54.0

Closes #34858

See merge request !12733
```
  7a7b0cc1
- merge Italian translation part.po to gitlab.po · 545ce888
  黄涛 authored Jul 12, 2017
  
  545ce888
- Merge branch 'update-gitaly-0-17-0' into 'master' · dc05bcd8
  Rémy Coutable authored Jul 12, 2017
```
Use Gitaly server v0.17.0

Closes #34853

See merge request !12802
```
  dc05bcd8
- Merge branch 'new-nav-preferences-image' into 'master' · 5ebe55d5
  Filipa Lacerda authored Jul 12, 2017
```
Updated new navigation image in preferences

Closes #34970

See merge request !12806
```
  5ebe55d5
- Extract the finder portion of ldap_person so it can be overridden in EE · 7f350ba1
  Nick Thomas authored Jul 12, 2017
  
  7f350ba1
- Updated new navigation image in preferences · 29b78425
  Phil Hughes authored Jul 12, 2017
```
Closes #34970
```
  29b78425
- Enable DeclarationOrder in scss-lint · bc09ea58
  Takuya Noguchi authored Jul 12, 2017
  
  bc09ea58
- Synchronous zanata in zh_TW translation · 8a89738f
  黄涛 authored Jul 12, 2017
  
  8a89738f
- Remove public/ci/favicon.ico · df3109ad
  Takuya Noguchi authored Jul 12, 2017
  
  df3109ad
- Merge branch 'remove-nprogress-gleaning' into 'master' · 2b827d05
  Clement Ho authored Jul 12, 2017
```
Remove CSS for nprogress removed

See merge request !12737
```
  2b827d05
- Merge branch 'enable-scss-lint-import-path' into 'master' · e963205c
  Clement Ho authored Jul 12, 2017
```
Enable ImportPath in scss-lint

See merge request !12749
```
  e963205c
- Merge branch 'enable-scss-lint-property-spelling' into 'master' · 553610c4
  Clement Ho authored Jul 12, 2017
```
Enable PropertySpelling in scss-lint

See merge request !12752
```
  553610c4
- Merge branch 'enable-scss-lint-space-after-comma' into 'master' · 375c910a
  Clement Ho authored Jul 12, 2017
```
Enable SpaceAfterComma in scss-lint

See merge request !12734
```
  375c910a
11 Jul, 2017 3 commits
- Enable PropertySpelling in scss-lint · c9424506
  Takuya Noguchi authored Jul 10, 2017
  
  c9424506
- Enable ImportPath in scss-lint · 2f7a399c
  Takuya Noguchi authored Jul 10, 2017
  
  2f7a399c
- Remove CSS for nprogress removed · eb36a9f0
  Takuya Noguchi authored Jul 09, 2017
  
  eb36a9f0