Skip to content
Snippets Groups Projects
This project is mirrored from https://:*****@gitlab.com/gitlab-org/gitlab.git. Pull mirroring failed .
Repository mirroring has been paused due to too many failed attempts. It can be resumed by a project maintainer or owner.
Last successful update .
  1. Mar 21, 2016
  2. Mar 18, 2016
    • Rémy Coutable's avatar
    • Douwe Maan's avatar
      Merge branch 'fix/git-annex-githooks' into 'master' · 023a315d
      Douwe Maan authored
      Disable githoooks for git annex commits
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/40
      
      <s>This fix checks if the commit `SHA` is also in one of the synced `git-annex` branches, which means that it should safely skip git hooks. </s> This may not work with multiple commits to the synced branch
      
      These `git-annex` commits also consistently have a message starting with git-annex blah... Using this, as probability of false positives is very low.
      
      See merge request !272
      023a315d
    • Douwe Maan's avatar
      Merge branch 'es_index_recreate' into 'master' · 67affcfa
      Douwe Maan authored
      ES: Index recreation
      
      
      
      See merge request !264
      67affcfa
    • Douwe Maan's avatar
      Merge branch 'confidential-issues' into 'master' · 2e96e288
      Douwe Maan authored
      Add confidential issues
      
      Closes gitlab-org/gitlab-ce#3678
      
      Tasks:
      
      - [X] Add `confidential` flag to `issues` table
      - [X] Allow user to mark/unmark an issue as confidential
      - [X] Restrict access to confidential issues for non-members/author/assignee
        - [X] Issues list
        - [X] Issue details
        - [X] API
        - [X] Search results when Elasticsearch is disabled
        - [X] Search results when Elasticsearch is enabled, and search by term
        - [x] Search results when Elasticsearch is enabled, and search by iid
      - [X] Remove references for confidential issues
        - [X] Issue/MR Description
        - [X] Notes
        - [X] Autocomplete
      - [x] Milestone overview
        - [x] Hide confidential issues for non-members/author/assignee
        - [x] Does not count confidential issues for non-members/author/assignee
      - [X] Add a lock icon to confidential issues
        - [X] Issues list
        - [X] Issue details
        - [X] Search results
      - [x] Activity Feed
        - [x] Hide confidential issues for non-members/author/assignee
      
      Screenshots:
      
      * New issue (1):
      
      ![new-issue-1](/uploads/b07f8e72cb2183492c142fdeba7ad8a1/new-issue-1.png)
      
      * New issue (2):
      
      ![new-issue-2](/uploads/ac3d6ed96d1e5ab95b076bc09c829b3e/new-issue-2.png)
      
      * Issues:
      
      ![issues](/uploads/2c891fbe536962a1501723b4cb4681a3/issues.png)
      
      * Issue:
      
      ![issue](/uploads/5b11db32ea618c590fc378f21589dd0c/issue.png)
      
      * Search:
      
      ![search](/uploads/88591dfc794d7bce097c72d286c87610/search.png)
      
      * Milestone:
      
      ![milestone](/uploads/c26b48a1786514b3a3d66026053e9277/milestone.png)
      
      See merge request !227
      2e96e288
    • Douwe Maan's avatar
      Merge branch 'trigger-todo-for-mentions-on-commits-page' into 'master' · 1793a65e
      Douwe Maan authored
      Trigger a todo for mentions on commits page
      
      Closes #14006 
      
      * Screenshot:
      
      ![todo-commit](/uploads/5d34de0b7afcea7548123dafddf60c45/todo-commit.png)
      
      See merge request !3262
      1793a65e
    • Jacob Schatz's avatar
      Merge branch 'optimistic-todos' into 'master' · 17d40eab
      Jacob Schatz authored
      Adds small AJAX optimistic functionality to todos.
      
      Fixes #13656 <br/>
      A good first step and boring solution. <br/>
      Will make ajax call to remove each issue.  <br/>
      If issue is last in group of issues will refresh page.  <br/>
      If issues remain in group will remove row with JS.  <br/>
      Adds loading spinner to button and disables. <br/>
      
      ![todos-optimistic](/uploads/c6aec4a688e5125d4df55a2a3a55d4d7/todos-optimistic.gif) <br/>
      
      cc @dzaporozhets @JobV @dbalexandre 
      
      See merge request !2946
      17d40eab
    • Douwe Maan's avatar
      Merge branch 'fix/14388' into 'master' · 17418461
      Douwe Maan authored
      Fix an issue when the target branch of a MR had been deleted
      
      Before displaying the "diverged commits" note, we're checking if the MR
      is open, but we should check if it's mergeable instead because this
      check ensure the source and target branches exist.
      
      This was introduced by !2217 and fixes #14388.
      
      See merge request !3294
      17418461
    • Douwe Maan's avatar
      Merge branch 'fix-mr-source-sha' into 'master' · 5b82e15b
      Douwe Maan authored
      Fix MergeRequest#source_sha when there is no diff
      
      Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14170
      
      ### Overview
      
      This MR fixes an unhandled Exception when visiting the page of an open Merge Request  without diff.
      
      ### Description
      
      `MergeRequest#source_sha` is expected to return the sha of the source branch last commit. But when an open Merge Request has no diff (e.g. all commits have already been merged to the target branch), `merge_request.source_sha` incorrectly returns `nil`.
      
      This was without consequences before – but since !2217 was merged (a few days ago), it makes `Gitlab::Git::Commit.between` raise an "Unexpected nil argument" exception. This can be reproduced when visiting the http://localhost:3000/gitlab-org/gitlab-test/merge_requests/2 page on a fresh local Gitlab setup.
      
      This MR fixes the crash, by making sure that `source_sha` returns a
      correct result even when there is no diff available. I also added tests.
      
      @DouweM I believe you wrote most of this code in the first place ; does this looks correct to you, or is there a better way to resolve this issue maybe?
      
      See merge request !3135
      5b82e15b
    • Jacob Vosmaer (GitLab)'s avatar
      Merge branch 'project-cache-worker-without-diverging' into 'master' · ddb2de09
      Jacob Vosmaer (GitLab) authored
      Removed diverging commit count calculation from Repository#build_cache
      
      Using a repository with 1000 branches the old `Repository#build_cache` method would take around 180 seconds to complete. Without calculating the diverging commit counts this method "only" takes around 60 seconds. 
      
      See commit 28cc2413eb5ddf920ce0b5eed803121f8b884754 for more details. This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14058
      
      cc @rspeicher 
      
      See merge request !3274
      ddb2de09
    • Jacob Schatz's avatar
      Merge branch 'add_avatar_to_issue_mr_header' into 'master' · c85085b7
      Jacob Schatz authored
      Add avatar to issue and MR pages header
      
      closes #14395
      # For Issues
      
      ### Before
      ![Screen_Shot_2016-03-18_at_4.27.25_PM](/uploads/b097c8e304c9737e2f46ee25667829bf/Screen_Shot_2016-03-18_at_4.27.25_PM.png)
      
      ### After
      ![Screen_Shot_2016-03-18_at_4.22.10_PM](/uploads/f7d2b12c9455950c2e660b33e27c1827/Screen_Shot_2016-03-18_at_4.22.10_PM.png)
      
      # For Merge Request
      
      ### Before
      ![Screen_Shot_2016-03-18_at_4.27.09_PM](/uploads/50c7b6ee346f749f448647004ae6031b/Screen_Shot_2016-03-18_at_4.27.09_PM.png)
      
      ### After
      ![Screen_Shot_2016-03-18_at_4.24.17_PM](/uploads/abd37ccf030e0b6d10521a6937206de6/Screen_Shot_2016-03-18_at_4.24.17_PM.png)
      
      See merge request !3301
      c85085b7
    • Jacob Schatz's avatar
      Merge branch 'fix-any-milestone-value' into 'master' · 56949f5e
      Jacob Schatz authored
      Fixes issue with any milestone value in dropdown not being selectable
      
      Closes #14293
      
      See merge request !3234
      56949f5e
    • Robert Speicher's avatar
      Merge branch 'filter-label-missing' into 'master' · 915edcee
      Robert Speicher authored
      Fixes issue with filter label missing on labels & milestones
      
      Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14407
      
      See merge request !3297
      915edcee
    • Jacob Schatz's avatar
      Merge branch 'issue-fade-load' into 'master' · ece28bda
      Jacob Schatz authored
      Changing filter dropdowns shows loading
      
      Instead of doing a full refresh of the page - i've modified the filterResults method on the Issues object to work for this form as well
      
      ![issues](/uploads/3335f09f7df88b6d419de7fd3d6857d2/issues.gif)
      
      Closes #14359
      
      See merge request !3237
      ece28bda
    • Douwe Maan's avatar
      cf52a9b4
    • Robert Speicher's avatar
      Merge branch 'rs-issue-14259' into 'master' · 4d48c607
      Robert Speicher authored
      Prevent a 500 when a repository's root_ref is nil
      
      Closes #14259
      
      See merge request !3278
      4d48c607
    • Jacob Schatz's avatar
      Merge branch 'improved-issue-sidebar' into 'master' · f6f949f4
      Jacob Schatz authored
      Improved issue sidebar
      
      Updated the spacing throughout the sidebar so that it fits better on smaller screens. Also adds a more participants button to show any other participants after the first row.
      
      Closes #13353
      
      See merge request !3097
      f6f949f4
    • Robert Speicher's avatar
      Merge branch 'dashboard-labels' into 'master' · 1dc218ed
      Robert Speicher authored
      Dashboard labels
      
      Previously because there were no JSON endpoint for labels or milestones
      it was fetching HTML and parsing that. This is wrong.
      
      It now fetches from a JSON endpoint.
      
      This also fixes the dashboard/issues page not loading labels or
      milestones as the path used to be only for a single project. So instead
      I have created a endpoint for labels & milestones JSON on dashboard.
      
      See merge request !3253
      1dc218ed
Loading