1. 24 Mar, 2016 1 commit
  2. 23 Mar, 2016 5 commits
    • Rémy Coutable's avatar
      Update 8.6.1 changelog · 419e5c8b
      Rémy Coutable authored
      [ci skip]
      419e5c8b
    • Achilleas Pipinellis's avatar
      Merge branch 'patch-2' into 'master' · 1ddff982
      Achilleas Pipinellis authored
      Update links to new pages group.
      
      Add updated links to pages docs.
      
      See merge request !294
      1ddff982
    • Heather McNamee's avatar
      Update links to new pages group. · 6c343928
      Heather McNamee authored
      6c343928
    • Douwe Maan's avatar
      Merge branch 'upgrade-ce-ee-migration-error-fix' into 'master' · 89e82697
      Douwe Maan authored
      Only rename the column if its not there yet
      
      The problem can only arise when upgrading from a CE version to an
       EE version after last months release as in that release the table
      appearances was created. But when it was created we already took
      care of this rename. Thus on an upgrade the migration will fail as
      the column `light_logo` is not in the table, and `header_logo` already
      is.
      
      Thus this check solves it. 
      
      @dblessing @DouweM 
      
      BTW; should be included in the current release and the previous.
      
      Fixes #406 
      
      See merge request !290
      89e82697
    • Zeger-Jan van de Weg's avatar
      Only rename the column if its not there yet · c9bb130b
      Zeger-Jan van de Weg authored
      The problem can only arise when upgrading from a CE version to an
       EE version after last months release as in that release the table
      appearances was created. But when it was created we already took
      care of this rename. Thus on an upgrade the migration will fail as
      the column `light_logo` is not in the table, and `header_logo` already
      is.
      
      Thus this check solve this.
      c9bb130b
  3. 22 Mar, 2016 1 commit
  4. 21 Mar, 2016 23 commits
  5. 19 Mar, 2016 2 commits
  6. 18 Mar, 2016 8 commits
    • Robert Speicher's avatar
    • Rémy Coutable's avatar
    • Rémy Coutable's avatar
      Fix specs · 259e3b55
      Rémy Coutable authored
      259e3b55
    • Douwe Maan's avatar
      Merge branch 'fix/update-gitlab-shell' into 'master' · 588289f0
      Douwe Maan authored
      Update gitlab-shell version and doc to 2.6.12
      
      
      
      See merge request !280
      588289f0
    • Douwe Maan's avatar
      Merge branch 'fix/git-annex-githooks' into 'master' · d69d4381
      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
      d69d4381
    • James Lopez's avatar
      update gitlab-shell version and doc · 394fcbd8
      James Lopez authored
      394fcbd8
    • James Lopez's avatar
      update CHANGELOG [ci skip] · ddb8d2b8
      James Lopez authored
      ddb8d2b8
    • Douwe Maan's avatar
      Merge branch 'confidential-issues' into 'master' · a88a6d4b
      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
      a88a6d4b