BigW Consortium Gitlab

  1. 25 Jan, 2015 6 commits
  2. 24 Jan, 2015 18 commits
  3. 23 Jan, 2015 14 commits
  4. 22 Jan, 2015 2 commits
    • Merge branch 'disable-turbolink-on-ci-links' into 'master' · b1dffe67
      Dmitriy Zaporozhets authored
      Disable turbolink on links pointing out to CI services
      
      ### What does this MR do?
      
      This MR adds 'data-no-turbolink' attribute into all links pointing to CI services.
      
      ### Are there points in the code the reviewer needs to double check?
      
      No
      
      ### Why was this MR needed?
      
      In rare cases where gitlab and CI service is installed on the same host, turbolink will be used for links between those two. This may result in corrupted css and javascript.
      
      This change is harmless for installations that do not share the domain name for GitLab and CI system - in such case, all links modified are already pointing out outside of the domain so turbolink won't handle them.
      
      ### What are the relevant issue numbers / Feature requests?
      
      I consider this a small fix, no issue has been added.
      
      See merge request !305
    • Merge branch 'feature_api_project_edit' into 'master' · e49b6364
      Dmitriy Zaporozhets authored
      API: Implement edit via API for projects
      
      I've picked up https://github.com/gitlabhq/gitlabhq/pull/8055 fixed the few hound warnings and replaced all double quotes in the spec file where possible.
      
      # From the original PR:
      
      Implements edit via API for projects. Edit was part of missing features in feature request Full CRUD operations via API for projects.
      http://feedback.gitlab.com/forums/176466-general/suggestions/3904506-full-crud-operations-via-api-for-projects
      
      Feature is implemented using existing UpdateService for projects. Permission to change visibility level and name are checked in addition to check for permission to administer project.
      
      Doesn't allow updating project namespace id, because there was existing API-method for transferring project to a group.
      
      Documentation added to doc/api/projects.md. Uses API request PUT /projects/:id .
      
      Tests included for:
      1. Success for changing path
      2. Success for changing name
      3. Success for changing visibility level
      4. Success for changing all other attributes
      5. Success for changing name & path to existing name & path but in different namespace
      6. Failure if not authenticated
      7. Failure if path exists in project's namespace
      8. Failure if name exists in project's namespace
      9. Failure if not sufficient permission to change name
      10. Failure if not sufficient permission to change visibility level
      11. Failure if not sufficient permission to change other attributes
      
      Allows updating following parameters:
      
      * name
      * path
      * visibility_level
      * public
      * default_branch
      * issues_enabled
      * wiki_enabled
      * snippets_enabled
      * merge_requests_enabled
      * description
      
      See merge request !310