Commits · c6bf292efba4be34fd832684bd25036354d7336b · nexedi / gitlab-ce

07 Aug, 2017 14 commits
- Add custom linter for inline JavaScript to haml_lint (!9742) · c6bf292e
  winniehell authored Mar 06, 2017
  
  c6bf292e
- Merge branch 'translation_missing_items_to_i18n' into 'master' · 95b232f2
  Rémy Coutable authored Aug 07, 2017
```
Synchronous zanata community contribution translation

See merge request !13266
```
  95b232f2
- Synchronous zanata community contribution translation · abc7b176
  Huang Tao authored Aug 07, 2017
  
  abc7b176
- Merge branch '35852_add_korean_translations_to_i18n' into 'master' · f66e8446
  Rémy Coutable authored Aug 07, 2017
```
Add Korean translation to i18n

Closes #35852

See merge request !13243
```
  f66e8446
- Add Korean translation to i18n · 0732b974
  Huang Tao authored Aug 07, 2017
  
  0732b974
- Merge branch 'winh-upgrade-haml_lint' into 'master' · 440dc934
  Douwe Maan authored Aug 07, 2017
```
Upgrade haml_lint Gem to 0.26.0

See merge request !13304
```
  440dc934
- Upgrade haml_lint Gem to 0.26.0 · bca5747d
  Winnie Hellmann authored Aug 07, 2017
  
  bca5747d
- Merge branch 'mattermost_fixes' into 'master' · e8a439ab
  Sean McGivern authored Aug 07, 2017
```
Fix Mattermost integration

See merge request !13305
```
  e8a439ab
- Merge branch 'docs/upgrades-for-background-migrations' into 'master' · d5e72a3b
  Sean McGivern authored Aug 07, 2017
```
Update the guides for updating GitLab and adding background migrations

See merge request !13284
```
  d5e72a3b
- Merge branch 'gitaly-renames-annotations' into 'master' · 9b216686
  Sean McGivern authored Aug 07, 2017
```
Gitaly deletions and annotations

See merge request !13280
```
  9b216686
- Merge branch '33095-mr-widget-ui' into 'master' · 3a087a00
  Phil Hughes authored Aug 07, 2017
```
Merge Request widget Improvements

Closes #33095

See merge request !12601
```
  3a087a00
- Merge branch 'fix-pdf-dependencies' into 'master' · 03b816f3
  Phil Hughes authored Aug 07, 2017
```
Fix issues with pdf-js dependencies

See merge request !13328
```
  03b816f3
- Fix issues with pdf-js dependencies · d9352780
  Mike Greiling authored Aug 07, 2017
  
  d9352780
- clean up merge request widget UI · bce029a2
  Simon Knox authored Aug 07, 2017
  
  bce029a2
06 Aug, 2017 2 commits
- Merge branch 'ci-lint-fix' into 'master' · 4b3011e1
  Tim Zallmann authored Aug 06, 2017
```
Fix order of CI lint ace editor loading

Closes #35985

See merge request !13316
```
  4b3011e1
- Merge branch '27616-fix-contributions-graph-utc-offset-mysql' into 'master' · 9b935080
  Tim Zallmann authored Aug 06, 2017
```
Fix Timezone Inconsistencies in User Contribution Calendar

Closes #27616 and #1943

See merge request !13208
```
  9b935080
04 Aug, 2017 24 commits
- Merge branch 'docs-fix-missing-changelog-entries' into 'master' · d1f27076
  Mike Greiling authored Aug 04, 2017
```
Add missing CHANGELOG.md entries for security release on 2017-01-23

See merge request !13327
```
  d1f27076
- fix missing changelog entries for security release on 2017-01-23 · 92cd5d0b
  Mike Greiling authored Aug 04, 2017
  
  92cd5d0b
- Merge branch 'fix/sm/34547-cannot-connect-to-ci-server-error-messages' into 'master' · edc81ea6
  Sean McGivern authored Aug 04, 2017
```
Fix "Cannot connect to CI server error messages"

Closes #34547

See merge request !13252
```
  edc81ea6
- Merge branch 'fix/sm/35931-active-ci-pipelineschedule-have-nullified-next_run_at' into 'master' · 848097b5
  Sean McGivern authored Aug 04, 2017
```
Fix "pipeline_schedules pages throwing error 500" when "Active Ci::PipelineSchedule have a nullified `next_run_at`"

Closes #32790

See merge request !13286
```
  848097b5
- Merge branch '35275-change-issue-icon' into 'master' · cad76726
  Phil Hughes authored Aug 04, 2017
```
Update top bar issues icon

Closes #35275

See merge request !13263
```
  cad76726
- Update top bar issues icon · 94168d5a
  Annabel Dunstone Gray authored Aug 04, 2017
  
  94168d5a
- Merge branch 'fix-pipeline-icon-contextual-nav' into 'master' · 0b102591
  Annabel Dunstone Gray authored Aug 04, 2017
```
Fix pipeline icon in contextual nav for projects

See merge request !13324
```
  0b102591
- Merge branch '34060-simplified-general-project-settings' into 'master' · 17342953
  Mike Greiling authored Aug 04, 2017
```
34060 Simply general project settings to use expanded panels

Closes #34060

See merge request !12620
```
  17342953
- Fix pipeline icon in contextual nav for projects · ff99e87e
  tauriedavis authored Aug 04, 2017
  
  ff99e87e
- Merge branch 'do-not-test-mysql-in-ee-non-master-or-stable' into 'master' · 017550d4
  Rémy Coutable authored Aug 04, 2017
```
Since mysql is not a priority anymore, test it less

See merge request !13320
```
  017550d4
- Merge branch 'source-install-yarn-2' into 'master' · f637c42d
  Mike Greiling authored Aug 04, 2017
```
Install 'yarn' globally to avoid PATH issues

See merge request !13273
```
  f637c42d
- Merge branch 'winh-new-dropdown-dividers' into 'master' · 25911e08
  Annabel Dunstone Gray authored Aug 04, 2017
```
Make dividers of new dropdown style full width

Closes #35784

See merge request !13276
```
  25911e08
- Merge branch '35944-missing-sidebar-icons' into 'master' · 154a55cf
  Phil Hughes authored Aug 04, 2017
```
Add container registry and spam logs icons

Closes #35944

See merge request !13317
```
  154a55cf
- Merge branch 'tc-fix-mr-query-params' into 'master' · 9dab1575
  Rémy Coutable authored Aug 04, 2017
```
Add spec to test combining API merge_requests query parameters

See merge request !11172
```
  9dab1575
- Merge branch '2902-standalone-ee-dir-ce' into 'master' · 5df9283f
  Rémy Coutable authored Aug 04, 2017
```
CE: Move EE-specific files to a standalone directory

Closes gitlab-ee#3097

See merge request !13311
```
  5df9283f
- Merge branch 'revert-6291bc8c' into 'master' · 450fa60f
  Rémy Coutable authored Aug 04, 2017
```
Revert "Merge branch 'rs-warm-capybara-only-in-ci' into 'master'"

See merge request !13292
```
  450fa60f
- Since mysql is not a priority anymore, test it less · ad838ea6
  Lin Jen-Shin authored Aug 04, 2017
  
  ad838ea6
- Merge branch 'feature/migrate-last-commit-for-path-to-gitaly' into 'master' · e299d595
  Robert Speicher authored Aug 04, 2017
```
Migrate Repository#last_commit_for_path to Gitaly

Closes gitaly#433

See merge request !13200
```
  e299d595
- Merge branch 'feature/migrate-load-blame-to-gitaly' into 'master' · 7e45159f
  Robert Speicher authored Aug 04, 2017
```
Migrate blame loading to Gitaly

Closes gitaly#421

See merge request !13155
```
  7e45159f
- Fix order of CI lint ace editor loading · 0ead0ea4
  Phil Hughes authored Aug 04, 2017
```
Closes #35985
```
  0ead0ea4
- Add container registry and spam logs icons · ee7fcf59
  Annabel Dunstone Gray authored Aug 04, 2017
  
  ee7fcf59
- Merge branch '35948-active-settings-pipelines' into 'master' · 83dafcb5
  Phil Hughes authored Aug 04, 2017
```
Add active state for pipelines settings on old nav

Closes #35948

See merge request !13297
```
  83dafcb5
- Merge branch '35659-rename-pipeline' into 'master' · 612b5a6f
  Annabel Dunstone Gray authored Aug 04, 2017
```
35659 Rename Pipelines tab to CI / CD in new navigation

Closes #35659

See merge request !13241
```
  612b5a6f
- Merge branch '32388-validate-and-document-openshift-support' into 'master' · 59800e6d
  Achilleas Pipinellis authored Aug 04, 2017
```
Move OpenShift blog from WWW to CE

See merge request !13301
```
  59800e6d