Permalink
Commits on Apr 16, 2015
  1. sm

    dilcom
    dilcom committed Apr 16, 2015
  2. Merge tag 'v7.9.2' of https://github.com/gitlabhq/gitlabhq

    dilcom
    dilcom committed Apr 16, 2015
    Version 7.9.2
    
    Conflicts:
    	app/views/projects/merge_requests/_show.html.haml
    	db/schema.rb
    	lib/gitlab/git_access.rb
  3. changes:

    dilcom authored and GitLab committed Feb 6, 2015
    1. add option for protected branches to allow developers only to merge into that branches (via merge requests)
    2. fix merge request building: before it used CI service from source project, now it uses CI from target
Commits on Apr 2, 2015
  1. Version 7.9.2

    dzaporozhets committed Apr 2, 2015
Commits on Mar 25, 2015
  1. Version 7.9.1

    dzaporozhets committed Mar 25, 2015
  2. Merge branch 'release/7.9.1' into '7-9-stable'

    dzaporozhets committed Mar 25, 2015
    WIP | Release 7.9.1
    
    See merge request !1738
  3. Merge branch 'milestone_and_labels_links' into 'master'

    dzaporozhets authored and maxlazio committed Mar 25, 2015
    Milestones and labels can be used even when issues are disabled.
    
    When Issues are disabled for a project Milestones and Labels can still be used for Merge Requests.
    
    See merge request !1739
Commits on Mar 24, 2015
  1. Update changelog.

    maxlazio committed Mar 24, 2015
  2. Merge branch 'no-comment-bubble' into 'master'

    dzaporozhets authored and maxlazio committed Mar 23, 2015
    Don't show commit comment button when user is not signed in.
    
    Address private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2167.
    
    See merge request !429
  3. Revert "Update gemnasium-gitlab-service gem"

    DouweM authored and maxlazio committed Mar 23, 2015
    This reverts commit af522ed.
  4. Merge pull request #9001 from vichak/master

    DouweM authored and maxlazio committed Mar 23, 2015
    Fix #8966 Remove Milestones/Labels from project navbar when Issues disabled
  5. Merge branch 'fix-admin-service-template-config' into 'master'

    DouweM authored and maxlazio committed Mar 23, 2015
    Include missing events and fix save functionality in admin service template settings form
    
    ### What does this MR do?
    
    This MR includes missing settings left out in the Admin -> Service Templates page and fixes the inability to save certain settings.
    
    ### Are there points in the code the reviewer needs to double check?
    
    No.
    
    ### Why was this MR needed?
    
    Because the service template form was broken and untested.
    
    ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?
    
    #1275
    
    Before:
    
    ![Screen_Shot_2015-03-23_at_5.53.19_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/e1bff75f30a3b6ecb174d3e25c722b7e/Screen_Shot_2015-03-23_at_5.53.19_AM.png)
    
    After:
    
    ![Screen_Shot_2015-03-23_at_5.53.13_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/8fada00128a3d0951b3230fefa64be92/Screen_Shot_2015-03-23_at_5.53.13_AM.png)
    
    See merge request !427
  6. Merge branch 'fix-import-from-modal' into 'master'

    dzaporozhets authored and maxlazio committed Mar 22, 2015
    Fix "Import projects from" button to show the correct instructions
    
    Closes #1267
    
    See merge request !422
    
    Conflicts:
    	app/views/projects/new.html.haml
  7. Merge branch 'fix-broken-new-project-import' into 'master'

    dzaporozhets authored and maxlazio committed Mar 23, 2015
    Fix OAuth2 issue importing a new project from GitHub and GitLab
    
    It appears that the GitLab OAuth2 client options were converted to strings instead of symbols when merged with the default options (i.e. `{}.merge(github_options)`). As a result, the OAuth2 defaults were being used. For example, the OAuth2 client options would have a key with `authorize_url` and `:authorize_url`, but the former was never used. As a result, the OAuth2 client would always use the wrong URL to talk to GitHub.
    
    Note that this bug should also have affected GitLab, but not Bitbucket: The OAuth client is careful to convert all keys to symbols.
    
    Closes #1268
    
    See merge request !425
  8. Merge pull request #8995 from MichaelAlt/patch-1

    DouweM authored and maxlazio committed Mar 23, 2015
    Faulty LDAP DN name escaping removed
Commits on Mar 21, 2015
  1. Version 7.9.0

    dzaporozhets committed Mar 21, 2015
Commits on Mar 20, 2015
  1. Fix typo.

    maxlazio authored and dzaporozhets committed Mar 20, 2015
  2. Fix commits routing

    dzaporozhets committed Mar 20, 2015
  3. Make issue and merge request sidebar more compact

    dzaporozhets committed Mar 20, 2015
    * move votes block to participants
    * make smaller font in sidebar
  4. Revert "Increase timeout for Git-over-HTTP requests."

    dzaporozhets committed Mar 20, 2015
    This reverts commit 516bcab.
    
    Conflicts:
    	Gemfile
Commits on Mar 19, 2015
  1. Version 7.9.0.rc3

    maxlazio committed Mar 19, 2015
  2. Merge branch 'commits_in_push_data' into '7-9-stable'

    dzaporozhets committed Mar 19, 2015
    Commits in push data should always be an array.
    
    See merge request !1726
  3. Merge branch 'rake_backup' into 'master'

    dzaporozhets authored and maxlazio committed Mar 19, 2015
    Backup repo with tar instead of git bundle
    
    Fixes gitlab/gitlab-ee#246
    
    See merge request !1723
Commits on Mar 18, 2015
  1. Version 7.9.0.rc2

    dzaporozhets committed Mar 18, 2015