Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Aug 3, 2015
  1. @randx

    Merge branch 'add-license'

    randx authored
Commits on Aug 2, 2015
  1. @stanhu
  2. @gipcompany

    Re-annotate models

    gipcompany authored
Commits on Jul 31, 2015
  1. @tsigo

    Make `code` elements in links display as such

    tsigo authored
    Also adds some minor padding to inline `code` elements.
  2. @DouweM

    Merge branch 'mention-name-in-flash-msg' into 'master'

    DouweM authored
    Mention group and project names in flash messages upon create, update and delete.
    
    Mention group and project names in flash messages upon create, update and delete. I also changed some wording inconsistency.
    
    **Before**
    
    ![project_created](https://gitlab.com/axil/gitlab-ce/uploads/b91b92e46b08d6c566acee8d88fccff1/project_created.png)
    
    **After**
    
    ![project_created_after](https://gitlab.com/axil/gitlab-ce/uploads/56db5125f2769386c43cf9e2f175a54d/project_created_after.png)
    
    See merge request !1070
  3. @DouweM

    Merge branch 'admin-group-member' into 'master'

    DouweM authored
    Add specific ability for managing group members
    
    To be used for https://dev.gitlab.org/gitlab/gitlab-ee/issues/290 (Internal issue)
    
    See merge request !1059
  4. @DouweM
  5. @DouweM

    Use before_actions

    DouweM authored
Commits on Jul 30, 2015
  1. @tsigo

    Merge branch 'api-new-attributes' into 'master'

    tsigo authored
    Add project star and fork count, group avatar URL and user/group web URL attributes to API
    
    Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2521.
    
    See merge request !1058
  2. @DouweM

    Fix method name.

    DouweM authored
  3. @DouweM
  4. @axilleas

    Raise alert when group is deleted.

    axilleas authored
    This change was made to match the project deletion.
  5. @DouweM

    Fix Project

    DouweM authored
  6. @DouweM

    No more web url

    DouweM authored
  7. @DouweM

    Merge branch 'fix-single-quote-in-network-graph' into 'master'

    DouweM authored
    Fix network graph when branch name has single quotes
    
    ## Steps to reproduce
    
    1. Create a branch with a single quote in the branch name: "`test`"
    2. Look at Project's Network view
    
    Closes #9500
    
    See merge request !1063
  8. Merge branch 'ssh-key-form' into 'master'

    Job van der Voort authored
    Switched the order of the SSH key form
    
    Now it looks like this:
    
    ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/dca3353266e93cec9cfd9f2f16af8657/image.png)
    
    
    See merge request !1069
  9. @stanhu
Commits on Jul 29, 2015
  1. @axilleas
  2. Switched the otder of the SSH key form

    Darby authored
  3. @stanhu

    Check that project was actually created rather than just validated in…

    stanhu authored
    … import:repos task
    
    Add gitlab-shell to error message to give user a clue that something may be wrong there.
    
    Ran into this in #2082. User was told that repositories were created when they were
    not due to hooks symlink being wrong.
  4. @DouweM

    Fix specs

    DouweM authored
  5. @DouweM
  6. @DouweM
  7. @DouweM

    Use URL helpers

    DouweM authored
  8. @dvrylc
  9. @stanhu

    Merge pull request #9341 from rumpelsepp/rouge

    stanhu authored
    Switch back to rouge gem for synthax highlighting
  10. @rumpelsepp

    Add HTMLGitlab formatter

    rumpelsepp authored rumpelsepp committed
    This custom formatter for rouge is needed to generate HTML output
    specifically for gitlab. Since its usecase is mostly suitable for
    gitlab it had been rejected upstream:
    jneen/rouge#268
    
    Thanks a lot to @stanhu, @jneen and @tsigo for review!
  11. @rumpelsepp

    Replace Rugments with Rouge

    rumpelsepp authored rumpelsepp committed
    I have mainly created the rugments fork for the purpose of improving
    gitlab's highlighting. Nowadays IMO it works way better than the old
    highlight.js solution. But the development is stuck on my side because
    of a couple of personal reasons:
    
      * I have finished my studies; last months I was writing my master
        thesis. So there was a huge time problem. I am sorry for that.
    
      * I had to move to Munich due to getting a (paid) job. Searching a
        flat here is horrible... :)
    
      * Last but not least, maintaining the same code base in two seperate
        projects is a mess.
    
    I have decided to switch back to rouge due to several reasons:
    
      * In the beginning I was quite motivated, but since I start
        working on my new job next week, the best solution IMO is
        switching back to upstream rouge.
    
      * Rouge is continously improving:
        https://github.com/jneen/rouge/blob/master/CHANGELOG.md
        http://rouge.jneen.net/
    
      * There should be absolutely no regressions with this change. Most
        likely this pull request will almost fix some minor bugs.
    
      * One less gem in gitlab is a good thing. since Gitlab is quite a
        huge bundle of gems. Reducing complexity should be a major
        milestone.
    
    Thanks a lot to @stanhu and @jneen for the review!
Commits on Jul 28, 2015
  1. @tsigo

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

    tsigo authored
    Make `hr`s more visible in note bodies
    
    Closes #2107
    
    See merge request !1054
  2. @tsigo

    Merge branch 'bitbucket-re-authorize' into 'master'

    tsigo authored
    Fix bug causing Bitbucket importer to crash when OAuth application
    had been removed.
    
    Fixes gitlab-com/support-forum#241.
    
    See merge request !1057
  3. @DouweM
  4. @DouweM
  5. @DouweM
  6. @DouweM
  7. Merge branch 'timestamp-wikis' into 'master'

    Job van der Voort authored
    Added a timestamp to the wikis page just below the title
    
    Now it looks like this:
    
    ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/813f85496db915cf14ee223c8b15478f/image.png)
    
    
    
    See merge request !1055
Something went wrong with that request. Please try again.