1. 26 Sep, 2016 10 commits
    • Rémy Coutable's avatar
      Merge branch 'robots-snippets' into 'master' · ebc4299d
      Rémy Coutable authored
      Update robots.txt disallow to allow users/groups starting with "s"
      
      ## What does this MR do?
      
      Update robots.txt "Disallow: /s" line to "Disallow: /s/"
      
      ## Why was this MR needed?
      
      Currently any Project that is under a username or group name that starts with "s" cannot be indexed because of this disallow line.
      
      For example on https://gitlab.com looking at the projects with the most stars there is this project: https://gitlab.com/somerobots/Trident
      
      If you do a Google search for "site:gitlab.com Trident", the project comes up but with "A description for this result is not available because of this site's robots.txt"
      
      Adding the trailing slash will still disallow all snippet short urls, but start allowing projects where the URI begins with "s"
      
      See merge request !6481
      ebc4299d
    • Rémy Coutable's avatar
      Merge branch 'patch-2' into 'master' · 477f0309
      Rémy Coutable authored
      Fixed a broken documentation link to the wiki-specific-markdown.
      
      ## What does this MR do?
      Fixes a broken link
      
      ## Are there points in the code the reviewer needs to double check?
      Well, it's a one line change, so it couldn't hurt, right?
      
      ## Why was this MR needed?
      Because broken links make us look like chumps. :)
      
      ## Screenshots (if relevant)
      
      ## Does this MR meet the acceptance criteria?
      Probably not.
      
      ## What are the relevant issue numbers?
      Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21760.
      
      See merge request !6117
      477f0309
    • Rémy Coutable's avatar
      Merge branch 'api-alphabetical' into 'master' · fca610e5
      Rémy Coutable authored
      Keep API mounts in alphabetical order
      
      ## What does this MR do?
      
      Just a cosmetic change to keep the API mounts in order.
      
      See merge request !6515
      fca610e5
    • Rémy Coutable's avatar
      Merge branch 'fix/import-services' into 'master' · adf50202
      Rémy Coutable authored
      Fixes issue with rails reserved keyword type exporting/importing services.
      
      The attribute `type`in services was being ignored by Import/Export. Added `type` as a method call in the export, as `type` gets ignored invoking `to_json`, manually adding this as a method in `import_export.yml` solves the problem. 
      
      On a different note, I found assigning a title directly to `CustomIssueTrackerService` didn't play very well with `prop_accessor`:
      
      ```ruby
      > CustomIssueTrackerService.new(title: 'asdf')
      NoMethodError: undefined method `[]=' for nil:NilClass
      > CustomIssueTrackerService.new(title: nil)
      NoMethodError: undefined method `[]=' for nil:NilClass
      ```
      
      This was also causing the Import/Export to failed... So I added a custom setter that fixed the problem.
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22461
      
      See merge request !6499
      adf50202
    • Rémy Coutable's avatar
      Merge branch 'ldap' into 'master' · bb8a41b2
      Rémy Coutable authored
      Replace deprecated Devise helper with new helper
      
      Closes #22357
      
      See merge request !6462
      bb8a41b2
    • Rémy Coutable's avatar
      Merge branch 'fix_trivial_doc_typo' into 'master' · 23ed83a1
      Rémy Coutable authored
      Fix trivial typo in docs
      
      
      
      See merge request !5849
      23ed83a1
    • James Lopez's avatar
      fix changelog · d70944d9
      James Lopez authored
      d70944d9
    • James Lopez's avatar
      added more specs · a5b9e1c2
      James Lopez authored
      a5b9e1c2
    • James Lopez's avatar
      Fixes issue with rails reserved keyword type exporting/importing services.... · a9f1e972
      James Lopez authored
      Fixes issue with rails reserved keyword type exporting/importing services. Also fixed CustomIssueTrackerService title setter and added relevant specs.
      a9f1e972
    • Dmitriy Zaporozhets's avatar
      Merge branch 'rs-remove-gitlab_meta' into 'master' · 1aca3670
      Dmitriy Zaporozhets authored
      Remove gitlab_meta gem
      
      
      
      See merge request !6510
      1aca3670
  2. 25 Sep, 2016 6 commits
  3. 24 Sep, 2016 5 commits
  4. 23 Sep, 2016 19 commits