1. 23 Mar, 2016 2 commits
  2. 17 Mar, 2016 4 commits
  3. 15 Mar, 2016 5 commits
  4. 11 Mar, 2016 2 commits
  5. 10 Mar, 2016 5 commits
  6. 08 Mar, 2016 2 commits
    • Rémy Coutable's avatar
      Version 8.5.5-rc1 · 62fc5b6a
      Rémy Coutable authored
    • Robert Speicher's avatar
      Merge branch 'add_show_role_boolean_to_group_member_view' into 'master' · f38f5797
      Robert Speicher authored
      Only show group member roles if explicitly requested
      This very simply fixes an EE problem, but I made the change here so it's less prone to errors from merges.
      In EE, prior to this change, group member roles were shown in project member list when a project is shared with a group. This is bad because the project explicitly shares with the group and sets a 'max access' level. If the max access level is 'developer' the project owner doesn't want to see 'Owner' in the group roles because it will confuse them. I verified that permissions are really being honored here, it was just an error in the view. You can see in https://gitlab.com/gitlab-org/gitlab-ee/blob/master/app/views/projects/project_members/_shared_group_members.html.haml#L18 where this was how it was intended to be. Likely a CE-EE merge introduced this bug. That's why I made the boolean required in CE even though this is for EE.
      See merge request !3044
  7. 06 Mar, 2016 2 commits
    • Kirill Smelkov's avatar
      NXD Teach GitLab about patches · 827d3914
      Kirill Smelkov authored
      Teach GitLab not only to merge changes from a merge-request, but also to
      apply patches posted to merge-request in a way like `git am` would do -
      without merge commit and directly on top of current branch. Which way to
      go is selected by user in web UI, and apply patches is the first option.
      There are 3 cases:
      - only 1 commit is present in MR -> the only available option is to
        apply that single commit as one patch without a merge
        ( There is no need for merge commit in this case at all: information
          about user who applied the patch goes to "Committer" field in resultant
          commit. Avoiding 1 merge per 1 patch results in cleaner history )
        It is also possible to review patch description directly in web UI,
        before doing the actual application, and correct / amend it as needed.
      - several commits are present in MR:
        * it is possible to apply the patches directly on top of current
          branch. Again information about who applied what goes to "Committer"
        * it is possible to merge MR changes with making a merge commit.
          This variant is useful, when patches from a MR do several logical
          steps to reach one goal, and MR description contain cover letter for
          whole patch series.
          in this case original commits stay untouched and resulting merge
          will contain MR author as author, user who accepted MR as committer,
          and cover letter as merge commit message.
          NOTE we avoid useless "Merge branch X into Y" in merge message, and
              just put MR title into merge subject and MR description into merge
              This way it is more logical with more important information in
              merge subject and thus e.g. more handy to oversee what a merge brings,
              just by it subject, e.g. via looking at updates via
                  gitk --first-parent ...
              or via web.
      NOTE for pre-generated references to merge-request we now use full MR
          URL, instead of !<MR-n>. Full URLs work everywhere, not only on
          original site where MR was created, or even only in original repo
          and not its fork on the same site.
    • Kirill Smelkov's avatar
      Sync with upstream 8-5-stable · 16c4f14b
      Kirill Smelkov authored
      * origin/8-5-stable:
        Remove "(unreleased)" from 8.5.4 release notes
        Merge branch 'fix/invalidate-builds-badge-cache' into 'master'
        Version 8.5.3
        Merge branch 'renaming-repository-caching' into 'master'
  8. 04 Mar, 2016 3 commits
  9. 03 Mar, 2016 3 commits
    • Rémy Coutable's avatar
      Version 8.5.3 · e6c783d3
      Rémy Coutable authored
    • Rémy Coutable's avatar
      Merge branch 'renaming-repository-caching' into 'master' · 45469dd2
      Rémy Coutable authored
      Flush repository caches before renaming projects
      This should hopefully solve gitlab-org/gitlab-ce#13790. Once I know the exact steps to reproduce the problem I should be able to confirm this.
      cc @dblessing @inem
      See merge request !2974
    • Kirill Smelkov's avatar
      Sync with upstream 8-5-stable · 1bfb586a
      Kirill Smelkov authored
      * 8-5-stable:
        Version 8.5.2
        Merge branch 'docs_todos' into 'master'
        Merge branch 'fix/13785-dashboard-projects-display-welcome-after-search' into 'master'
        Merge branch 'fix/13781-delete-tag-without-ajax' into 'master'
        Merge branch 'fix/deprecated-ci-badge-permissions' into 'master'
        Merge branch 'issue_13623' into 'master'
        Merge branch 'fix/12652-omniauth-import-from-gitlab-com-fails' into 'master'
        Merge branch 'shortcuts-help' into 'master'
        Merge branch 'rel-url-fix' into 'master'
        Merge branch 'sidebar-overlap-fix' into 'master'
        Merge branch 'rs-improve-grace-period' into 'master'
        Merge branch 'issue_13648' into 'master'
        Merge branch 'issue_13621' into 'master'
        Merge branch 'issue_13851' into 'master'
        Merge branch 'fix-migration' into 'master'
        Merge branch '11489-branded-appearance-to-ce' into 'master'
        Update Rails to
  10. 02 Mar, 2016 8 commits
  11. 01 Mar, 2016 4 commits
    • Douwe Maan's avatar
      Merge branch 'rel-url-fix' into 'master' · 58e247d8
      Douwe Maan authored
      Fix relative URL
      See https://github.com/gitlabhq/gitlabhq/issues/10053
       1. Same configuration way for relative URL like with Omnibus
       2. Loading the relative configuration from Rakefile as Rails do not load initializers for `asset:precompile`
      First point has another positive side effect: no collisions (due to git controlled `application.rb`) any more during the upgrades of source based installations and relative url configuration
       - [x] tests on the source based installation
       - [x] tests on the centos&ubuntu omnibus packages
      Fixes: gitlab-org/gitlab-ce#13730, gitlab-org/gitlab-ce#13727, gitlab-org/omnibus-gitlab#1143 and https://github.com/gitlabhq/gitlabhq/issues/10053
      See merge request !2979
    • Dmitriy Zaporozhets's avatar
      Merge branch 'sidebar-overlap-fix' into 'master' · c081928d
      Dmitriy Zaporozhets authored
      Fix issue with overlap of sidebar links.
      Thanks @iamphill for the help with this one. 
      cc @iamphill @alfredo1 @dzaporozhets @rymai 
      See merge request !3043
    • Douwe Maan's avatar
      Merge branch 'rs-improve-grace-period' into 'master' · c05bb007
      Douwe Maan authored
      Don't show any "2FA required" message if it's not actually required
      Prior, if the user had enabled and then disabled 2FA, they would be
      shown a "You must enable Two-factor Authentication for your account."
      message when going back to re-activate it, even if 2FA enforcement was
      See merge request !3014
    • Dmitriy Zaporozhets's avatar
      Merge branch 'issue_13648' into 'master' · e11ab453
      Dmitriy Zaporozhets authored
      Improve implementation to check read access to forks and add pagination.
      Fixes #13648
      The following optimizations where made:
      - Pagination was added.
      - Code to check for read permissions to forks was optimized, in the past we were doing too many queries for each project.
      See merge request !2991