Commit Graph
24026 Commits
Author SHA1 Message Date
Douwe Maan 28669c86be Bump Git version requirement to 2.7.4 (for 8.5) 2016-03-17 22:45:24 +01:00
Jacob VosmaerandRémy Coutable 157e4c9a0d Merge branch 'git-version' into 'master'
Install Git 2.7.3, not 2.4.3



See merge request !3248
2016-03-17 18:07:45 +01:00
Robert Speicher 72913edb02 Version 8.5.7 v8.5.7 2016-03-15 18:46:41 -04:00
Robert SpeicherandRobert Speicher c7a3d75973 Merge branch 'git-2-7-3' into 'master'
Bump Git version requirement to 2.7.3

[ci skip]

See merge request !3240
2016-03-15 18:28:33 -04:00
Rémy Coutable 0424e72d29 Version 8.5.6 v8.5.6 2016-03-15 12:56:27 +01:00
Rémy Coutable 515f2a027e Add CHANGELOG entry for 8.5.6
[ci skip]
2016-03-15 12:33:05 +01:00
Rémy Coutable 42b785a9a8 Merge branch 'ldap-lease-8.5' into '8-5-stable'
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
2016-03-15 11:30:49 +00:00
Jacob Vosmaer bf253a1087 Obtain lease before querying LDAP 2016-03-11 13:47:49 +01:00
Jacob Vosmaer 73c777cf67 Backport ExclusiveLease to 8.5 2016-03-11 13:38:58 +01:00
Rémy Coutable 11f388aaac Version 8.5.5 v8.5.5 2016-03-10 20:32:49 +01:00
Douwe MaanandRémy Coutable 5daf8923ef Merge branch 'fix-filtered-pagination' into 'master'
Allow filtered explore results to be paged. Fixes #14104

See merge request !3149
2016-03-10 18:48:35 +01:00
Jacob Schatz ea09a38f8c Merge branch 'fix/14168' into '8-5-stable'
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
2016-03-10 15:13:29 +00:00
Rémy Coutable f8e220b6ff Fix "Show all" link behavior
Fixes #14168
2016-03-10 15:32:17 +01:00
Douglas Barbosa AlexandreandRémy Coutable fe4d3abead Merge branch 'fix-todos' into 'master'
Fix error 500 in Todos

Closes #14095

Closes #14075

Closes #14109

Closes #14151

See merge request !3141
2016-03-10 10:35:34 +01:00
Rémy Coutable 62fc5b6ab5 Version 8.5.5-rc1 v8.5.5-rc1 2016-03-08 13:02:20 +01:00
Robert SpeicherandRémy Coutable f38f579728 Merge branch 'add_show_role_boolean_to_group_member_view' into 'master'
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-08 12:22:55 +01:00
Rémy Coutable 2c6618b9a4 Version 8.5.4 v8.5.4 2016-03-04 13:48:05 +01:00
Rémy Coutable 145f7dda96 Remove "(unreleased)" from 8.5.4 release notes
[ci skip]
2016-03-04 13:23:07 +01:00
Rémy Coutable 60f9ce6af8 Merge branch 'fix/invalidate-builds-badge-cache' into 'master'
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-04 13:20:49 +01:00
Rémy Coutable e6c783d32f Version 8.5.3 v8.5.3 2016-03-03 17:01:49 +01:00
Rémy Coutable 45469dd2de Merge branch 'renaming-repository-caching' into 'master'
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-03 16:37:24 +01:00
Rémy Coutable 3a93df83a1 Version 8.5.2 v8.5.2 2016-03-02 18:33:33 +01:00
Achilleas PipinellisandRémy Coutable 00b935b27d Merge branch 'docs_todos' into 'master'
Add Todos documentation

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13884

See merge request !3064
2016-03-02 14:08:19 +01:00
Douwe MaanandRémy Coutable e75989db43 Merge branch 'fix/13785-dashboard-projects-display-welcome-after-search' 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-02 14:06:00 +01:00
Rémy Coutable 5d534a1d4b Merge branch 'fix/13781-delete-tag-without-ajax' into 'master'
Tag deletion doesn't use AJAX anymore

See merge request !2986
2016-03-02 14:05:38 +01:00
Douwe MaanandRémy Coutable 4d857c08d5 Merge branch 'fix/deprecated-ci-badge-permissions' into 'master'
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-02 12:08:21 +01:00
Douwe MaanandRémy Coutable 26959be0cf Merge branch 'issue_13623' into 'master'
Show days remaining instead of elapsed time for Milestone.

Closes #13623

See merge request !2978
2016-03-02 11:57:50 +01:00
Rémy Coutable a8ca1d5016 Merge branch 'fix/12652-omniauth-import-from-gitlab-com-fails' into 'master'
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-02 11:43:19 +01:00
Rémy Coutable 1c3d8aaeef Merge branch 'shortcuts-help' into 'master'
Fix help keyboard shortcut for relative URL setups

Fixes gitlab-org/gitlab-ce#12751

See merge request !3016
2016-03-02 10:46:52 +01:00
Douwe MaanandRémy Coutable 58e247d83b Merge branch 'rel-url-fix' into 'master'
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-01 17:37:51 +01:00
Dmitriy ZaporozhetsandRémy Coutable c081928d06 Merge branch 'sidebar-overlap-fix' into 'master'
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-01 17:34:16 +01:00
Douwe MaanandRémy Coutable c05bb00737 Merge branch 'rs-improve-grace-period' into 'master'
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-01 17:04:32 +01:00
Dmitriy ZaporozhetsandRémy Coutable e11ab453ee Merge branch 'issue_13648' into 'master'
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-01 12:13:32 +01:00
Douwe MaanandRémy Coutable 9052086d7b Merge branch 'issue_13621' into 'master'
Don't repeat labels listed on Labels tab.

Fixes #13622

See merge request !2924
2016-03-01 12:13:04 +01:00
Rémy Coutable 5c8f6ba3dd Merge branch 'issue_13851' into 'master'
Brings back missing "Gitlab" text on the logo

Closes #13851 

See merge request !2989
2016-03-01 11:57:27 +01:00
Dmitriy ZaporozhetsandRémy Coutable 710b3356ff Merge branch 'fix-migration' into 'master'
Fix broken migration

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For !2927 

See merge request !3011
2016-03-01 11:48:53 +01:00
Douwe MaanandRémy Coutable 5a3c5ace67 Merge branch '11489-branded-appearance-to-ce' into 'master'
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 😉

/cc @DouweM

See merge request !2927
2016-03-01 11:41:03 +01:00
Rémy Coutable cdb8fc5e9e Merge branch 'rs-update-rails-stable' into '8-5-stable'
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-01 10:38:06 +00:00
Robert Speicher 9687c9d1f8 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
2016-02-29 17:48:31 -05:00
Rémy Coutable 3510569eb6 Merge branch 'sidebar-hide-class' into 'master'
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-26 17:49:04 +01:00
Robert SpeicherandRémy Coutable dd11449183 Merge branch 'fix-gemfile-lock' into 'master'
Fix order in Gemfile.lock

See merge request !2969
2016-02-26 16:59:38 +01:00
Robert SpeicherandRémy Coutable 70090bd8a6 Merge branch 'fix-todos' into 'master'
Does not create a Todo when commenting on commit or project snippet

Closes #13733

See merge request !2964
2016-02-26 16:47:54 +01:00
Rémy Coutable 184b4bc6d5 Merge branch 'rs-crowd-form-view-spec' into 'master'
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-26 16:46:46 +01:00
Jacob SchatzandRémy Coutable b0864a9f5d Merge branch 'feature/jschatz1/sidebar-sizing' into 'master'
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-26 16:46:27 +01:00
Rémy Coutable 8b7080df0c Version 8.5.1 v8.5.1 2016-02-24 14:05:26 +01:00
Jacob SchatzandRémy Coutable fa82f67f86 Merge branch 'highlighted-note' into 'master'
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-24 13:02:37 +01:00
Jacob SchatzandRémy Coutable 069fec4f43 Merge branch 'fix-moving-revert-button' into 'master'
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-24 12:50:13 +01:00
Rémy Coutable c89ee575bd Merge branch 'bugfix/jschatz1/missing-project-button' into 'master'
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-24 12:03:09 +01:00
Rémy Coutable 0075858e4b Re-order CHANGELOG by merge request IDs 2016-02-24 11:01:37 +01:00
Rémy Coutable ee0dfb2602 Fix typo in CHANGELOG 2016-02-24 10:54:19 +01:00