Commits · 6acb708db7e1b5054f764ba8cef4c89566ee4c53 · nexedi / gitlab-ce

12 Jul, 2017 9 commits
- fixed admin breadcrumb titles · 6acb708d
  Phil Hughes authored Jul 12, 2017
  
  6acb708d
- fixed some inconsistencies · 43cc8bd4
  Phil Hughes authored Jul 12, 2017
  
  43cc8bd4
- moved `@breadcrumb_title` out of the HAML & into a helper method · 13cc761a
  Phil Hughes authored Jul 12, 2017
  
  13cc761a
- moved declaration of `breadcrumb_title` into `page_title` method · 9fcc28d4
  Phil Hughes authored Jul 12, 2017
```
`breadcrumb_title` is then overriden when needed
```
  9fcc28d4
- Merge branch 'master' into new-nav-fix-contextual-breadcrumbs · ab6c8935
  Phil Hughes authored Jul 12, 2017
  
  ab6c8935
- 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 31 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
- Enable SpaceAfterComma in scss-lint · 2fb911aa
  Takuya Noguchi authored Jul 08, 2017
  
  2fb911aa
- Merge branch 'breadcrumbs-limit-width' into 'master' · 919c9930
  Annabel Dunstone Gray authored Jul 11, 2017
```
Added limit-container-width to breadcrumbs container

Closes #34573

See merge request !12776
```
  919c9930
- Merge branch 'rs-issue-34941' into 'master' · bd50b152
  Stan Hu authored Jul 11, 2017
```
Make `Redis::Wrapper#_raw_config` and `#fetch_config` more resilient

Closes #34941

See merge request !12797
```
  bd50b152
- Merge branch 'toggle-new-project-import-description' into 'master' · d3eff572
  Clement Ho authored Jul 11, 2017
```
Toggle import description with import_sources_enabled

Closes #34826

See merge request !12691
```
  d3eff572
- Toggle import description with import_sources_enabled · a516853a
  Brianna Kicia authored Jul 11, 2017
  
  a516853a
- Make `Redis::Wrapper#_raw_config` and `#fetch_config` more resilient · b904a7db
  Robert Speicher authored Jul 11, 2017
```
These two methods now handle two additional real-world possibilities:

1. `config/resque.yml` not being present
2. `config/resque.yml` being present but not containing YAML

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/34941
```
  b904a7db
- Update CHANGELOG.md for 9.3.6 · 02341c59
  kushalpandya authored Jul 12, 2017
```
[ci skip]
```
  02341c59
- Merge branch '34796_add_esperanto_translations_of_pipeline_charts' into 'master' · bf8df44e
  Douwe Maan authored Jul 11, 2017
```
Add Esperanto translations of Pipeline Charts

Closes #34796

See merge request !12699
```
  bf8df44e
- Merge branch '34795_add_bulgarian_translations_of_pipeline_charts' into 'master' · 34e97014
  Douwe Maan authored Jul 11, 2017
```
Add Bulgarian translations of Pipeline Charts

Closes #34795

See merge request !12698
```
  34e97014
- Merge branch... · 07c4e233
  Douwe Maan authored Jul 11, 2017
```
Merge branch '34791_add_traditional_chinese_in_hongkong_translations_of_pipeline_charts' into 'master'

Add Traditional Chinese in HongKong translations of Pipeline Charts

Closes #34791

See merge request !12696
```
  07c4e233
- Merge branch '34790_add_simplified_chinese_translations_of_pipeline_charts' into 'master' · 23442bd5
  Douwe Maan authored Jul 11, 2017
```
Add Simplified Chinese translations of Pipeline Charts

Closes #34790

See merge request !12695
```
  23442bd5
- Merge branch 'update-gitlab-shell' into 'master' · 015be655
  Stan Hu authored Jul 11, 2017
```
Update GitLab Shell to v5.3.0

See merge request !12730
```
  015be655
- Merge branch '34729-blob' into 'master' · b957f79d
  Douwe Maan authored Jul 11, 2017
```
snippet has a blob, but isn't a blob

Closes #34729

See merge request !12792
```
  b957f79d
- Merge branch '34867-remove-net-ssh-gem' into 'master' · 7a938e67
  Rémy Coutable authored Jul 11, 2017
```
Remove net-ssh gem

Closes #34867

See merge request !12736
```
  7a938e67
- Merge branch 'sh-add-mr-simple-mode' into 'master' · 0ef9fab1
  Sean McGivern authored Jul 11, 2017
```
Add a simple mode to merge request API

Closes #34920

See merge request !12766
```
  0ef9fab1
- Merge branch 'jej/9-4-update-license-list' into 'master' · e8b610ee
  Rémy Coutable authored Jul 11, 2017
```
Updated vendor/licenses.csv for 9.4

See merge request !12788
```
  e8b610ee
- Merge branch 'sh-bump-sidekiq' into 'master' · e785478a
  Robert Speicher authored Jul 11, 2017
```
Update Sidekiq from 5.0.0 to 5.0.4

See merge request !12774
```
  e785478a
- Merge branch '34907-dont-show-pipeline-schedule-button-for-non-member' into 'master' · 2e9517af
  Kamil Trzciński authored Jul 11, 2017
```
Do not show pipeline schedule button for non-member

Closes #34907

See merge request !12757
```
  2e9517af
- Use view=simple for simplifying merge requests API · faf95438
  Stan Hu authored Jul 11, 2017
  
  faf95438
- Merge branch 'sidebar-badge-fix-firefox' into 'master' · 2a5d2ecf
  Filipa Lacerda authored Jul 11, 2017
```
Fixed badge alignment in new project sidebar in FireFox

See merge request !12777
```
  2a5d2ecf
- snippet has a blob, but isn't a blob · e0f4a63e
  Simon Knox authored Jul 11, 2017
  
  e0f4a63e
- Updated vendor/licenses.csv for 9.4 · f47a7ab5
  James Edwards-Jones authored Jul 11, 2017
```
Autogenerated using `bin/bundle exec license_finder report --format=csv --save=vendor/licenses.csv`
Required license_finder 3.0.1 for https://github.com/pivotal/LicenseFinder/pull/304
```
  f47a7ab5
- Merge branch 'jej/create-update-instructions-for-9-4' into 'master' · e2edbdf8
  Achilleas Pipinellis authored Jul 11, 2017
```
Update 9.4 update instructions to include changes made to 9.3 instructions

See merge request !12781
```
  e2edbdf8
- Merge branch 'fix-n-plus-one-in-url-builder' into 'master' · 07e2b20c
  Rémy Coutable authored Jul 11, 2017
```
Don't reload ActiveRecord objects when building note URLs

Closes #34882

See merge request !12780
```
  07e2b20c
- Merge branch 'jej/update-source-install-instructions-for-9-4' into 'master' · df054058
  Achilleas Pipinellis authored Jul 11, 2017
```
Update source installation instructions for 9.4

See merge request !12779
```
  df054058
- Add a simple mode to merge request API · e17ac570
  Stan Hu authored Jul 10, 2017
```
The current "basic" merge request API still loads too much data. For integrations
like the Trello Power-up, we just need the basics.

Closes #34920
```
  e17ac570
- Merge branch 'jej/9-4-update-gitignore-and-license-templates' into 'master' · be7c690f
  Rémy Coutable authored Jul 11, 2017
```
Update CI templates for 9.4

See merge request !12784
```
  be7c690f
- Merge branch '34933-fix-welcome-page-actions-alignment' into 'master' · 01dabbd5
  Phil Hughes authored Jul 11, 2017
```
Fix welcome page action items alignment

Closes #34933

See merge request !12778
```
  01dabbd5