Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-03-08Version 8.5.5-rc1v8.5.5-rc1Rémy Coutable
2016-03-08Merge branch 'add_show_role_boolean_to_group_member_view' into 'master'Robert Speicher
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
2016-03-04Version 8.5.4v8.5.4Rémy Coutable
2016-03-04Remove "(unreleased)" from 8.5.4 release notesRémy Coutable
[ci skip]
2016-03-04Merge branch 'fix/invalidate-builds-badge-cache' into 'master' Rémy Coutable
Invalidate cache for builds badge This fixes cache issue with badges (we should not cache badge images). Closes #13982 See merge request !3086
2016-03-03Version 8.5.3v8.5.3Rémy Coutable
2016-03-03Merge branch 'renaming-repository-caching' into 'master'Rémy Coutable
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
2016-03-02Version 8.5.2v8.5.2Rémy Coutable
2016-03-02Merge branch 'docs_todos' into 'master'Achilleas Pipinellis
Add Todos documentation Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13884 See merge request !3064
2016-03-02Merge branch 'fix/13785-dashboard-projects-display-welcome-after-search' ↵Douwe Maan
into 'master' 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
2016-03-02Merge branch 'fix/13781-delete-tag-without-ajax' into 'master'Rémy Coutable
Tag deletion doesn't use AJAX anymore See merge request !2986
2016-03-02Merge branch 'fix/deprecated-ci-badge-permissions' into 'master'Douwe Maan
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
2016-03-02Merge branch 'issue_13623' into 'master'Douwe Maan
Show days remaining instead of elapsed time for Milestone. Closes #13623 See merge request !2978
2016-03-02Merge branch 'fix/12652-omniauth-import-from-gitlab-com-fails' into 'master'Rémy Coutable
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
2016-03-02Merge branch 'shortcuts-help' into 'master'Rémy Coutable
Fix help keyboard shortcut for relative URL setups Fixes gitlab-org/gitlab-ce#12751 See merge request !3016
2016-03-01Merge branch 'rel-url-fix' into 'master'Douwe Maan
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
2016-03-01Merge branch 'sidebar-overlap-fix' into 'master' Dmitriy Zaporozhets
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
2016-03-01Merge branch 'rs-improve-grace-period' into 'master'Douwe Maan
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
2016-03-01Merge branch 'issue_13648' into 'master'Dmitriy Zaporozhets
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
2016-03-01Merge branch 'issue_13621' into 'master'Douwe Maan
Don't repeat labels listed on Labels tab. Fixes #13622 See merge request !2924
2016-03-01Merge branch 'issue_13851' into 'master' Rémy Coutable
Brings back missing "Gitlab" text on the logo Closes #13851 See merge request !2989
2016-03-01Merge branch 'fix-migration' into 'master' Dmitriy Zaporozhets
Fix broken migration Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For !2927 See merge request !3011
2016-03-01Merge branch '11489-branded-appearance-to-ce' into 'master'Douwe Maan
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
2016-03-01Merge branch 'rs-update-rails-stable' into '8-5-stable' Rémy Coutable
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
2016-03-01Update Rails to 4.2.5.2Robert Speicher
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
2016-02-26Merge branch 'sidebar-hide-class' into 'master' Rémy Coutable
Created helper class to hide content in issue sidebar when collapsed ![Screen_Shot_2016-02-25_at_10.38.39](/uploads/ca49cc230edf7e71b7726e905f523092/Screen_Shot_2016-02-25_at_10.38.39.png) Closes #13764 See merge request !2968
2016-02-26Merge branch 'fix-gemfile-lock' into 'master' Robert Speicher
Fix order in Gemfile.lock See merge request !2969
2016-02-26Merge branch 'fix-todos' into 'master'Robert Speicher
Does not create a Todo when commenting on commit or project snippet Closes #13733 See merge request !2964
2016-02-26Merge branch 'rs-crowd-form-view-spec' into 'master' Rémy Coutable
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
2016-02-26Merge branch 'feature/jschatz1/sidebar-sizing' into 'master'Jacob Schatz
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 ![screensize](/uploads/9a21fa06d583a49d6ebbf1ada34c6792/screensize.gif) ![screensize-small](/uploads/7c25f46e962248a40840562a01c83f8f/screensize-small.gif) Also sorry I couldn't get the collapse button in the screen cap. It's there. See merge request !2620
2016-02-24Version 8.5.1v8.5.1Rémy Coutable
2016-02-24Merge branch 'highlighted-note' into 'master'Jacob Schatz
Changed padding & background color for highlighted notes Closes #12453 ![Screen_Shot_2016-02-23_at_11.18.59](/uploads/19150d884fd1175fe0df5f6daee64206/Screen_Shot_2016-02-23_at_11.18.59.png) See merge request !2937
2016-02-24Merge branch 'fix-moving-revert-button' into 'master'Jacob Schatz
Fixed revert button tooltip placement causing movement Before: ![moving-tooltip](/uploads/65cb9a41e8b8114fd8ee10d68cfd8206/moving-tooltip.gif) After: ![moving-tooltip](/uploads/a1c36eb5735dc7592c49f6b5cb1469b5/moving-tooltip.gif) See merge request !2910
2016-02-24Merge branch 'bugfix/jschatz1/missing-project-button' into 'master'Rémy Coutable
Fix group projects styles Makes new project button visible when no projects are available. Fixes #13193 ![Screen_Shot_2016-02-04_at_1.08.27_PM](/uploads/36be9d5892506e7d1abcf4eb2a622e12/Screen_Shot_2016-02-04_at_1.08.27_PM.png) ![Screen_Shot_2016-02-04_at_1.07.48_PM](/uploads/fa257a1965017ff1274572dc66fccf90/Screen_Shot_2016-02-04_at_1.07.48_PM.png) ![Screen_Shot_2016-02-04_at_1.07.28_PM](/uploads/326f6fdac24b56e8408efd0d11dc2805/Screen_Shot_2016-02-04_at_1.07.28_PM.png) cc @creamzy @skyruler See merge request !2714
2016-02-24Re-order CHANGELOG by merge request IDsRémy Coutable
2016-02-24Fix typo in CHANGELOGRémy Coutable
2016-02-24Merge branch 'issue-sidebar-content-scrolling' into 'master'Jacob Schatz
Fixed issue with content in the issue sidebar disappearing Closes #13626 See merge request !2919
2016-02-24Fix typo in CHANGELOGRémy Coutable
2016-02-24Merge branch 'bring-back-newrelic-gem' into 'master'Rémy Coutable
Revert "Remove newrelic gem. Closes #12860" This reverts commit 531767175f0a364a332c74bf27c5f202732ce519. Conflicts: Gemfile.lock See merge request !2943
2016-02-24Merge branch 'hudecof/show-crowd-login-form-when-signin-disabled' into 'master'Robert Speicher
Show Crowd login even when sign-in is disabled Fixes #13176. See merge request !2749
2016-02-24Merge branch 'fix-todos' into 'master'Robert Speicher
Does not raise an error when Todo is already marked as done Closes #13681 See merge request !2926
2016-02-24Merge branch 'rs-update-raven' into 'master'Robert Speicher
Update sentry-raven to 0.15.6 Fixes a few bugs, most notably (for our purposes): https://github.com/getsentry/raven-ruby/pull/450 See merge request !2947
2016-02-23Merge branch 'dz-small-ui-fixes' into 'master'Jacob Schatz
Set of UI fixes * Improve wiki pages * Improve profile pages cc @skyruler See merge request !2758
2016-02-23Merge branch 'uploads-700' into 'master'Marin Jankovski
Restrict permissions on public/uploads Based on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/631 See merge request !2764
2016-02-23Merge branch 'milestone-drag-empty-list' into 'master'Jacob Schatz
Issues can be dragged & dropped into empty milestone lists This is also possible with MRs. Also fixed an issue where MRs weren't sortable Fixes #13668 ![milestone](/uploads/aada0f48ce8b1407cce920eef3f4d5f3/milestone.gif) See merge request !2935
2016-02-23Add 8.5.1 changes to CHANGELOGRémy Coutable
2016-02-23Merge branch 'fix/13631-error-with-merged-mr' into 'master' Rémy Coutable
Ensure we don't check a commit's description for revert message if it has no description Fixes #13631. /cc @razer6 @grzesiek @yorickpeterse @rdavila See merge request !2917
2016-02-23Merge branch 'issue_13463' into 'master' Jacob Schatz
Fix Side-by-side view after loading diff results Fixes #13463 See merge request !2880
2016-02-23Merge branch 'add_missing_doc' into 'master' Achilleas Pipinellis
Add when the API changes got introduced See merge request !2912
2016-02-23Merge branch 'fix-failing-issue-tests' into 'master' Rémy Coutable
Fixed failing issues tests Also removed up/down vote icons from merge requests. Was missed from d8069bd85863ab8c47d2bb2370221b17fb686b93 See merge request !2911
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 11:32:57 +0300