1. 03 Apr, 2015 5 commits
    • Drew Blessing's avatar
      Merge branch 'issue-sidebar-size' into 'master' · aedc1254
      Drew Blessing authored
      Changes the width of sidebar in issues and MRs when affix event fires
      
      Fixes #1320
      
      Width is set when Bootstraps affix event is fired and then removed when it reaches the top or bottom.
      
      See merge request !464
      aedc1254
    • Hannes Rosenögger's avatar
      Merge branch 'feature_expose_project_labels' into 'master' · 965b92a7
      Hannes Rosenögger authored
      Exposing Project Labels in the REST API
      
      The intent here is to expose the tag_list property of the Project entity over the REST API so that any project searches include the information. The specific reason I've implemented this change is for an environment in which multiple gitlab servers exist, where a central portal to the projects that are spread around the network will be useful. Having access to filtering on this fairly large project list based on their labels, will be of great use.
      
      This satisfies the feature request http://feedback.gitlab.com/forums/176466-general/suggestions/6325819-project-labels-via-api
      
      The change was made in the `lib/api/entities.rb` file.
      
      The output of a `GET` to something like `/projects` or `/projects/7` is now:
      ```javascript
      {
        "id": 7,
        "description": "Veritatis est eaque voluptas magni expedita.",
        "default_branch": "master",
        **"tag_list": [
          "typeahead",
          "twitter"
        ],**
        "public": false,
        "archived": false,
        "visibility_level": 0,
        ...
      }
      ```
      
      See merge request !329
      965b92a7
    • Douwe Maan's avatar
      Merge branch 'fix-backup-spec-regexp' into 'master' · 9157985c
      Douwe Maan authored
      Improve regexp to prevent false positives
      
      If a filename happened to contain "db" and enough "rwx" characters before, then
      this test would previously fail. For example:
      
      ```
      drwxr-xr-x gitlab-runner/gitlab-runner      0 2015-04-02 07:46 uploads/tmp/cassidy.stokes8477/gitlabhq/36d972fa55d6b44810fc6fd843473adb/
      ```
      
      Adding a space before the "db" match string tightens up the regexp and reduces the
      chance of an unintended match.
      
      See merge request !489
      9157985c
    • Douwe Maan's avatar
      Merge branch 'configurable-attachment-size' into 'master' · 31720630
      Douwe Maan authored
      Support configurable attachment size in Application Settings page
      
      ### What does this MR do?
      
      This MR provides the ability to configure the maximum size of an attachment inside a note. A parameter has been added to the Application Settings page.
      
      ### Are there points in the code the reviewer needs to double check?
      
      What should be done with the legacy note attachment validation? I added code to make the validation work with the configurable setting. I could see an issue where an admin lowers the limit from 10 megabytes to 5 megabytes, which could cause an existing model to be invalid.
      
      ### Why was this MR needed?
      
      We often have attachments that exceed 10 MB, and it would be nice to be able to override the defaults.
      
      ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?
      
      See Issue #1258
      
      ### Screenshots
      
      Before:
      
      ![Screen_Shot_2015-03-29_at_3.06.53_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6013a1dbc8cf61a63e93744149937fa0/Screen_Shot_2015-03-29_at_3.06.53_PM.png)
      
      After:
      
      ![Screen_Shot_2015-03-29_at_3.12.34_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f3518af7e8653ba40f0a3579456da6ad/Screen_Shot_2015-03-29_at_3.12.34_PM.png)
      
      See merge request !407
      31720630
    • Cristian Medina's avatar
      Modified lib/api/entities.rb to expose Project class tag_list property to the API · f0454905
      Cristian Medina authored
      Updated projects.md to show tag_list field when performing GETs
      Updated projects_spec.rb to include check for tag_list key in project list
      Added changes to the CHANGELOG
      f0454905
  2. 02 Apr, 2015 11 commits
  3. 01 Apr, 2015 10 commits
  4. 31 Mar, 2015 14 commits