- 23 Mar, 2016 2 commits
-
-
Kazuhiko Shiozaki authored
-
Kazuhiko Shiozaki authored
-
- 17 Mar, 2016 4 commits
-
-
Robert Speicher authored
-
Robert Speicher authored
Bump Git version requirement to 2.7.4 (for 8.5) [ci skip] See merge request !3286
-
Douwe Maan authored
-
Jacob Vosmaer authored
Install Git 2.7.3, not 2.4.3 See merge request !3248
-
- 15 Mar, 2016 5 commits
-
-
Robert Speicher authored
-
Robert Speicher authored
Bump Git version requirement to 2.7.3 [ci skip] See merge request !3240
-
Rémy Coutable authored
-
Rémy Coutable authored
[ci skip]
-
Rémy Coutable authored
Use leases for LDAP checks in 8.5 Back-port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3143 See merge request !3181
-
- 11 Mar, 2016 2 commits
-
-
Jacob Vosmaer authored
-
Jacob Vosmaer authored
-
- 10 Mar, 2016 5 commits
-
-
Rémy Coutable authored
-
Douwe Maan authored
Allow filtered explore results to be paged. Fixes #14104 See merge request !3149
-
Jacob Schatz authored
Fix "Show all" link behavior The "Show all" link was broken by recent refactors from @joshfng. I have fixed it very simply (I believe). **Please note that this fix will be in 8.5.x only** (since the whole "Show all" stuff was moved to pagination recently (8.6). Fixes #14168 /cc @joshfng @dzaporozhets @razer6 See merge request !3159
-
Rémy Coutable authored
Fixes #14168
-
Douglas Barbosa Alexandre authored
Fix error 500 in Todos Closes #14095 Closes #14075 Closes #14109 Closes #14151 See merge request !3141
-
- 08 Mar, 2016 2 commits
-
-
Rémy Coutable authored
-
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. ![Screen_Shot_2016-03-01_at_8.59.02_AM](/uploads/704ab3149f60c363dd8374bd0c06a46a/Screen_Shot_2016-03-01_at_8.59.02_AM.png) ![Screen_Shot_2016-03-01_at_9.17.54_AM](/uploads/5fcabef352cbc41dade037767f90ace3/Screen_Shot_2016-03-01_at_9.17.54_AM.png) See merge request !3044
-
- 06 Mar, 2016 2 commits
-
-
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" field. * 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 description. 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 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'
-
- 04 Mar, 2016 3 commits
-
-
Rémy Coutable authored
-
Rémy Coutable authored
[ci skip]
-
Rémy Coutable authored
Invalidate cache for builds badge This fixes cache issue with badges (we should not cache badge images). Closes #13982 See merge request !3086
-
- 03 Mar, 2016 3 commits
-
-
Rémy Coutable authored
-
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 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 4.2.5.2
-
- 02 Mar, 2016 8 commits
-
-
Rémy Coutable authored
-
Achilleas Pipinellis authored
Add Todos documentation Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13884 See merge request !3064
-
Douwe Maan authored
Don't show "Welcome to GitLab" when the search didn't return any projects Fixes #13785. /cc @pixdrift ### Before ![Screen_Shot_2016-03-02_at_10.55.02](/uploads/b6b6ead2143d01e374ad296e72182d79/Screen_Shot_2016-03-02_at_10.55.02.png) ### After ![Screen_Shot_2016-03-02_at_12.12.33](/uploads/6e16c44e69039c534ea0fc3373c6060b/Screen_Shot_2016-03-02_at_12.12.33.png) See merge request !3059
-
Rémy Coutable authored
Tag deletion doesn't use AJAX anymore See merge request !2986
-
Douwe Maan authored
Fix permissions for deprecated CI build status badge This fixes permissions for deprecated status badge, being unavailable even if project is public. Closes #13324 See merge request !3030
-
Douwe Maan authored
Show days remaining instead of elapsed time for Milestone. Closes #13623 See merge request !2978
-
Rémy Coutable authored
Fix import from gitlab.com fails _Originally opened at !2896 by @kazsw._ - - - Fixes #12652 CGI.escape encodes '/' by default. Second argument can be removed. See merge request !2988
-
Rémy Coutable authored
Fix help keyboard shortcut for relative URL setups Fixes gitlab-org/gitlab-ce#12751 See merge request !3016
-
- 01 Mar, 2016 4 commits
-
-
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 authored
Fix issue with overlap of sidebar links. Thanks @iamphill for the help with this one. ![Screen_Shot_2016-03-01_at_10.19.52_AM](/uploads/f203fde79ae397ad18f23c4108f1c306/Screen_Shot_2016-03-01_at_10.19.52_AM.png) cc @iamphill @alfredo1 @dzaporozhets @rymai See merge request !3043
-
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 disabled. See merge request !3014
-
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
-