Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jun 2, 2015
  1. @randx

    Merge branch 'ignore-references' into 'master'

    randx authored
    Don't notify users mentioned in code blocks or blockquotes.
    
    cc @rspeicher
    
    See merge request !753
  2. @DouweM

    Merge branch 'rs-more-nofollow' into 'master'

    DouweM authored
    Render Group and Project descriptions with our Markdown pipeline
    
    Continuation of !727, this ensures external links in these fields also get `rel="nofollow"` added.
    
    Bonus: Emoji now works in them! :sparkles:
    
    See merge request !735
  3. @tsigo
  4. @tsigo

    Rename ReferenceFilterSpecHelper to FilterSpecHelper

    tsigo authored
    And make it more generalized for all filter specs.
  5. @tsigo
  6. @tsigo

    Add a `pipeline` context option for SanitizationFilter

    tsigo authored
    When this option is `:description`, we use a more restrictive whitelist.
    This is used for Project and Group description fields.
  7. @tsigo
  8. @tsigo
  9. @randx
  10. @randx

    Merge branch 'ci_yml_file' into 'master'

    randx authored
    GitLab CI service sends gitlab-ci.yml file
    
    See merge request !689
  11. @maxlazio

    Merge pull request #8730 from drunkard/master

    maxlazio authored
    Specify shell while run me as git user
  12. @vsizov
  13. @DouweM

    Fix spec.

    DouweM authored
  14. @DouweM

    Add changelog entry.

    DouweM authored
  15. @DouweM

    Fix typo.

    DouweM authored
  16. @randx

    Improve hover color

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  17. @DouweM
  18. @DouweM
  19. @randx

    Merge branch 'web-editor-rugged' into 'master'

    randx authored
    Create and edit files in web editor via rugged
    
    - [x] create file via rugged
    - [x] update file via rugged
    - [x] remove file via rugged
    - [ ] fix tests
    - [x] remove satellites code
    - [x] create activity event for new/edit file via rugged
    - [x] base64 support
    
    Part of https://dev.gitlab.org/gitlab/gitlabhq/issues/2300
    
    See merge request !751
  20. @randx

    Remove unnecessary satellite files and add CHANGELOG item

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  21. @randx

    Make web editor work correctly after switch from satellites

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  22. @randx

    Remove files in web editor using rugged

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  23. @DouweM

    Merge branch 'rs-issue-1721' into 'master'

    DouweM authored
    Fix link_to_gfm with only a reference having the incorrect link
    
    Before:
    
    ```ruby
    link_to_gfm("#4", "/foo")     # => "<a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>"
    link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>"
    ```
    
    After:
    
    ```ruby
    link_to_gfm("#4", "/foo")     # => "<a href="/foo">#4</a>"
    link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>"
    ```
    
    Closes #192
    Closes #1721
    Closes [GitHub #7115](#7115)
    
    See merge request !739
  24. @randx

    Remove now unnecessary satelittes logic for creating and editing file…

    randx authored
    … with web editor
    
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  25. @DouweM

    Merge branch 'feature/sso_integration' into 'master'

    DouweM authored
    Add an option to automatically sign-in with an Omniauth provider
    
    Split of !669 as requested
    
    This is useful when integrating with existing SSO environments and we want to use a single Omniauth provider for all user authentication.
    
    See merge request !723
  26. @randx

    Create activity event and execute hooks on web editor commit

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  27. @randx

    Remove file api tests which depend on old satellite logic

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Commits on Jun 1, 2015
  1. @randx

    Use rugged in web editor for base64 encoding

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  2. @randx

    Allow base64 for edit blobs

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  3. @randx

    Fix adding new file to empty repo

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  4. @randx

    Create and edit files in web editor via rugged

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  5. @randx

    Merge branch 'refactor-header' into 'master'

    randx authored
    Refactor header css/html
    
    * Fixes UI issue with header on zoom
    * Replace duplicate numbers with variable
    * Better names for css classes
    * refactor header views
    
    Fixes #1640
    
    See merge request !750
  6. @randx

    improve navbar collapse for mobile views

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  7. @randx

    Fix header overflow for big title

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  8. @randx

    Refactor header views

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Something went wrong with that request. Please try again.