| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |
|
|
| |
[ci skip]
|
| |\
| |
| |
| |
| |
| |
| | |
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
|
| | | |
|
| |/ |
|
| | |
|
| |
|
|
|
|
| |
Allow filtered explore results to be paged. Fixes #14104
See merge request !3149
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |/
|
|
| |
Fixes #14168
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix error 500 in Todos
Closes #14095
Closes #14075
Closes #14109
Closes #14151
See merge request !3141
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| | |
|
| |
|
|
| |
[ci skip]
|
| |
|
|
|
|
|
|
|
| |
Invalidate cache for builds badge
This fixes cache issue with badges (we should not cache badge images).
Closes #13982
See merge request !3086
|
| | |
|
| |
|
|
|
|
|
|
|
|
| |
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
|
| | |
|
| |
|
|
|
|
|
|
| |
Add Todos documentation
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13884
See merge request !3064
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
into 'master'
Don't show "Welcome to GitLab" when the search didn't return any projects
Fixes #13785. /cc @pixdrift
### Before
### After
See merge request !3059
|
| |
|
|
|
|
| |
Tag deletion doesn't use AJAX anymore
See merge request !2986
|
| |
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
| |
Show days remaining instead of elapsed time for Milestone.
Closes #13623
See merge request !2978
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
| |
Fix help keyboard shortcut for relative URL setups
Fixes gitlab-org/gitlab-ce#12751
See merge request !3016
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
|
| |
Fix issue with overlap of sidebar links.
Thanks @iamphill for the help with this one.
cc @iamphill @alfredo1 @dzaporozhets @rymai
See merge request !3043
|
| |
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
| |
Don't repeat labels listed on Labels tab.
Fixes #13622
See merge request !2924
|
| |
|
|
|
|
|
| |
Brings back missing "Gitlab" text on the logo
Closes #13851
See merge request !2989
|
| |
|
|
|
|
|
|
|
| |
Fix broken migration
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
For !2927
See merge request !3011
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Branded appearance to CE
Closes #11489
The difference with the EE version is only that there is no distinction between light and dark logos, though this wasn't used anyway. If this is fine, I'll create a MR on EE too.
TODO:
- [x] Copy docs
- [x] Make new screenshots
- [ ] Remove Custom Welcome message feature?
@rymai: I was unsure what labels to add to ping you, so I just ping you like this :wink:
/cc @DouweM
See merge request !2927
|
| |\
| |
| |
| |
| |
| |
| |
| | |
Update Rails to 4.2.5.2
See https://groups.google.com/forum/#!msg/rubyonrails-security/ddY6HgqB2z4/we0RasMZIAAJ
and https://groups.google.com/forum/#!msg/rubyonrails-security/ly-IH-fxr_Q/WLoOhcMZIAAJ
See merge request !3020
|
| |/
|
|
|
| |
See https://groups.google.com/forum/#!msg/rubyonrails-security/ddY6HgqB2z4/we0RasMZIAAJ
and https://groups.google.com/forum/#!msg/rubyonrails-security/ly-IH-fxr_Q/WLoOhcMZIAAJ
|
| |
|
|
|
|
|
|
|
| |
Created helper class to hide content in issue sidebar when collapsed
Closes #13764
See merge request !2968
|
| |
|
|
|
| |
Fix order in Gemfile.lock
See merge request !2969
|
| |
|
|
|
|
|
|
| |
Does not create a Todo when commenting on commit or project snippet
Closes #13733
See merge request !2964
|
| |
|
|
|
|
|
|
|
|
|
| |
Move "I should see Crowd login form" feature to a view spec
We were doing all kinds of code gymnastics to "enable" Crowd in the
feature spec and this would sometimes cause a transient failure.
Really what it's testing is if the Crowd login form shows when Crowd's
enabled, so this is much better suited to a view spec.
See merge request !2963
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Sidebar overlaps content when screen is below 1200px.
When screen is below 1200px, the sidebar overlaps.
When screen is above 1200px, the sidebar pushes content out.
z-index change to make sure hamburger stays on top.
Fixes #12717
Also sorry I couldn't get the collapse button in the screen cap. It's there.
See merge request !2620
|
| | |
|
| |
|
|
|
|
|
|
|
|
| |
Changed padding & background color for highlighted notes
Closes #12453
See merge request !2937
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixed revert button tooltip placement causing movement
Before:
After:
See merge request !2910
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix group projects styles
Makes new project button visible when no projects are available.
Fixes #13193
cc @creamzy @skyruler
See merge request !2714
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
| |
Fixed issue with content in the issue sidebar disappearing
Closes #13626
See merge request !2919
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
| |
Revert "Remove newrelic gem. Closes #12860"
This reverts commit 531767175f0a364a332c74bf27c5f202732ce519.
Conflicts:
Gemfile.lock
See merge request !2943
|
| |
|
|
|
|
|
|
| |
Show Crowd login even when sign-in is disabled
Fixes #13176.
See merge request !2749
|
