Permalink
Switch branches/tags
Commits on Oct 18, 2017
  1. Merge branch '36160-zindex' into 'master'

    annabel committed Oct 18, 2017
    Decreases z-index of select2 to a lower number of our navigation bar
    
    Closes #36160
    
    See merge request gitlab-org/gitlab-ce!14925
  2. Merge branch '39253-jobs-fail-because-of-brazilian-portuguese-transla…

    rymai committed Oct 18, 2017
    …tions' into 'master'
    
    Resolve "Jobs fail because of Brazilian Portuguese translations"
    
    Closes #39253
    
    See merge request gitlab-org/gitlab-ce!14939
  3. Merge branch 'pms-fix-tooltip-padding' into 'master'

    annabel committed Oct 18, 2017
    Fix tooltip padding to align to 8px grid
    
    See merge request gitlab-org/gitlab-ce!14928
  4. Merge branch '39237-fix-ee_compat_check' into 'master'

    smcgivern committed Oct 18, 2017
    Improve the gitlab:dev:ee_compat_check task to pass a repo URL without credentials
    
    Closes #39237
    
    See merge request gitlab-org/gitlab-ce!14934
  5. Prevent ApplicationHelper specs from polluting later ones

    smcgivern committed Oct 18, 2017
    We don't want the locale to be set to Brazilian Portuguese for any subsequent
    specs!
  6. Improve the gitlab:dev:ee_compat_check task to pass a repo URL withou…

    rymai committed Oct 17, 2017
    …t credentials
    
    Signed-off-by: Rémy Coutable <remy@rymai.me>
  7. Merge branch 'bvl-fix-locale-path' into 'master'

    Tim Zallmann committed Oct 18, 2017
    Render region codes for locale assets with an `_` instead of a `-`
    
    Closes #39225
    
    See merge request gitlab-org/gitlab-ce!14924
  8. Merge branch 'add-lazy-option-to-user-avatar-image-component' into 'm…

    Tim Zallmann committed Oct 18, 2017
    …aster'
    
    Add lazy option to UserAvatarImage
    
    See merge request gitlab-org/gitlab-ce!14895
  9. Merge branch 'fix-resolved-side-by-side' into 'master'

    iamphill committed Oct 18, 2017
    Fix resolved discussions not expanding on side by side view
    
    Closes #39209
    
    See merge request gitlab-org/gitlab-ce!14918
  10. Fix tooltip padding to align to 8px grid

    Pedro Moreira da Silva committed Oct 18, 2017
  11. Merge branch '38986-due-date' into 'master'

    iamphill committed Oct 18, 2017
    Fix Pikaday
    
    Closes #38986
    
    See merge request gitlab-org/gitlab-ce!14881
  12. Fix Pikaday

    Filipa Lacerda committed with iamphill Oct 18, 2017
  13. Merge branch 'feature/migrate-wiki-write-page-to-gitaly' into 'master'

    smcgivern committed Oct 18, 2017
    Migrate Gitlab::Git::Wiki#write_page to Gitaly
    
    Closes gitaly#638
    
    See merge request gitlab-org/gitlab-ce!14870
  14. Merge branch '39201-improve-google-image' into 'master'

    iamphill committed Oct 18, 2017
    Replace google login image
    
    Closes #39201
    
    See merge request gitlab-org/gitlab-ce!14919
  15. Build the locale path with an `_` instead of a `-`

    Reprazent committed Oct 18, 2017
    The locale code is turned into an asset path with an underscore
    instead of a dash.
    
    The language codes are transformed by `I18n.locale` into a code with a
    dash. But the resources for translating are always stored in a path
    using a `_` separating the language and the region code.
  16. Merge branch 'sh-security-fix-backports-master' into 'master'

    rspeicher committed Oct 18, 2017
    Backport all fixes from GitLab 10.1 into master
    
    See merge request gitlab-org/gitlab-ce!14922
  17. Merge branch '30140-restore-readme-only-preference' into 'master'

    DouweM committed Oct 18, 2017
    Add readme only option as project view
    
    Closes #30140
    
    See merge request gitlab-org/gitlab-ce!14900
  18. Merge branch '37032-get-project-branch-invalid-name-message' into 'ma…

    rymai committed Oct 18, 2017
    …ster'
    
    Get Project Branch API shows an helpful error message on invalid refname
    
    Closes #37032
    
    See merge request gitlab-org/gitlab-ce!14884
  19. Merge branch 'tc-saml-fix-false-empty' into 'master'

    DouweM committed Oct 18, 2017
    SAML fix when auth hash attributes do not define groups
    
    Closes #38923
    
    See merge request gitlab-org/gitlab-ce!14913
  20. Small code style changes

    DouweM committed Oct 18, 2017
  21. Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' in…

    grzesiek committed Oct 18, 2017
    …to 'master'
    
    Add short_revision and use total_size
    
    Closes #39203
    
    See merge request gitlab-org/gitlab-ce!14917
  22. Fix SAML error 500 when no groups are defined for user

    To1ne committed Oct 17, 2017
    When there are no groups defined in the auth hash attributes,
    `Gitlab::Saml::AuthHash#groups` should return an empty array, and
    `Gitlab::Saml::User#find_user` should not mark the user as external.
    
    Closes gitlab-org/gitlab-ce#38923.
  23. Get Project Branch API shows an helpful error message on invalid refname

    intrip committed Oct 14, 2017
    In API v4 when requesting a branch with an invalid refname shows an
    helpful error message: 'The branch refname is invalid'.
  24. Merge branch 'improve-database-yml-examples' into 'master'

    rymai committed Oct 18, 2017
    Improve database yml examples
    
    See merge request gitlab-org/gitlab-ce!10247
Commits on Oct 17, 2017
  1. Merge branch 'security-10-1' into '10-1-stable'

    Jen-Shin Lin committed with stanhu Oct 17, 2017
    Security fixes for 10.1 RC
    
    See merge request gitlab/gitlabhq!2209
  2. Fix broken test

    Filipa Lacerda committed Oct 17, 2017
  3. Update database.yml.postgresql

    bogdanvlviv committed Mar 26, 2017
    host is omitted by default
  4. Merge branch 'ph-multi-file-editor-restructure-data' into 'master'

    Filipa Lacerda committed Oct 17, 2017
    Refactored multi-file data structure
    
    See merge request gitlab-org/gitlab-ce!14862