1. 02 Jun, 2016 15 commits
    • Robert Speicher's avatar
      Merge branch 'fix/migration-uri-issue' into 'master' · 322464ea
      Robert Speicher authored
      Fix import URL migration error
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17956
      
      See merge request !4321
      322464ea
    • Yorick Peterse's avatar
      Fixed CHANGELOG entry for !4312 · 0591d06b
      Yorick Peterse authored
      0591d06b
    • Douwe Maan's avatar
      Merge branch 'fix-404-labels-in-todos' into 'master' · 4cd2d468
      Douwe Maan authored
      Fix 404 page when viewing TODOs that contain milestones or labels in different projects
      
      A user viewing the TODOs page will see a 404 if there are mentioned milestones or labels in multiple different projects. This is likely a caching bug and only occurs
      when Markdown rendering occurs across multiple projects, which is why it's so tricky to reproduce. This is what I think is happening:
          
      1. LabelReferenceFilter#references_in encounters label ~X for ProjectA and finds the label in the DB as id = 1.
      2. LabelReferenceFilter.references_in yields [1, 'X', nil, ...]
      3. Since project_ref is nil, AbstractReferenceFilter#project_from_ref_cache caches nil => ProjectA.
      4. LabelReferenceFilter#references_in encounters label ~Y for ProjectB and finds the label in the DB as id = 2.
      5. LabelReferenceFilter.references_in yields [2, 'Y', nil, ...]
      6. AbstractReferenceFilter#project_from_ref_cache lookups nil and returns ProjectA. It was supposed to be ProjectB.
      7. A is the wrong project, so the label lookup fails.
         
      This MR expands the `project_ref` to the right value as soon as we have it to avoid this caching bug.
          
      Closes #17898
      
      
      See merge request !4312
      4cd2d468
    • Jacob Schatz's avatar
      Merge branch 'fix-shortcuts-spec' into 'master' · 6b6c5db1
      Jacob Schatz authored
      Ensure project name is present on page
      
      ## What does this MR do?
      Fixes a failing spec
      
      
      
      
      See merge request !4307
      6b6c5db1
    • Yorick Peterse's avatar
      Added CHANGELOG entry for !4303 · 4b03f999
      Yorick Peterse authored
      4b03f999
    • Jacob Schatz's avatar
      Merge branch 'discussion-outdated-form' into 'master' · 46a83371
      Jacob Schatz authored
      Fixed JS error when trying to remove discussion form
      
      ## What does this MR do?
      
      Fixes a JS error which was caused by an ID of the form not matching what was returned by the JSON. Instead of checking that, it gets the current form from the ajax success event.
      
      This would only happen on outdated discussions because the ID of the discussion form ends with `-false` because it isn't active. However, the note is added to an active discussion so the ID returned actually ends in `-true` & therefore the JS couldn't find the correct form.
      
      ## What are the relevant issue numbers?
      
      Closes #17778
      
      See merge request !4303
      46a83371
    • Yorick Peterse's avatar
      Fixed CHANGELOG for !4301 · 42b9a515
      Yorick Peterse authored
      42b9a515
    • Robert Speicher's avatar
      Merge branch 'fix/gitlab-importer-issue' into 'master' · ac98845e
      Robert Speicher authored
      Fix gitlab importer issue
      
      Fixed credentials not being called correctly - probably some bad refactoring or search & replace... 
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/565
      
      See merge request !4301
      ac98845e
    • Yorick Peterse's avatar
      Added CHANGELOG entry for !4287 · 88bb7b51
      Yorick Peterse authored
      88bb7b51
    • Jacob Schatz's avatar
      Merge branch 'merge-button-color-fix' into 'master' · 2b431314
      Jacob Schatz authored
      Fixed issue with button color when no CI enabled
      
      ## What does this MR do?
      
      Fixes an issue with the color of the merge button when no CI is setup.
      
      ## What are the relevant issue numbers?
      
      Closes #17844
      
      ## Screenshots
      
      ![Screen_Shot_2016-05-25_at_09.58.44](/uploads/87aac74c5e2f8bfd2831e99c5915856d/Screen_Shot_2016-05-25_at_09.58.44.png)
      
      See merge request !4287
      2b431314
    • Jacob Schatz's avatar
      Merge branch 'generic-commit-status' into 'master' · c4abaf41
      Jacob Schatz authored
      Move tags to column in generic_commit_status
      
      Part of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4249    
      
      cc @ayufan 
      
      
      
      See merge request !4277
      c4abaf41
    • Yorick Peterse's avatar
      Moved CHANGELOG entry for !4230 · cf6ce9ae
      Yorick Peterse authored
      cf6ce9ae
    • Douwe Maan's avatar
      Merge branch 'improve-pipeline-design' into 'master' · 66c01627
      Douwe Maan authored
      Improve design of Pipeline view
      
      ## What does this MR do?
      
      Improves current design of Pipelines view when there is multiple stages.
      This makes the statuses clickable and makes the view more compact.
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-05-21_at_01.20.40](/uploads/dd031b7af7005c7a61f3165fefa8b7c9/Screen_Shot_2016-05-21_at_01.20.40.png)
      
      cc @DouweM @markpundsack @rspeicher @marin 
      
      See merge request !4230
      66c01627
    • Yorick Peterse's avatar
      Added CHANGELOG entry for !3869 · 85b4e064
      Yorick Peterse authored
      85b4e064
    • Jacob Schatz's avatar
      Merge branch 'fix-multiple-ci-status-poll' into 'master' · 9b09a94c
      Jacob Schatz authored
      Fixed potential issue with 2 ci status polling events happening
      
      Possible cause for double notifications was if the request was slow & then you changed page whilst this request was happening it would finish on another page & then launch another interval - this stops that issue.
      
      Also passed in the CI status as an option value rather than waiting for the first ajax request to finish
      
      See merge request !3869
      9b09a94c
  2. 25 May, 2016 22 commits
  3. 23 May, 2016 3 commits