Commit Graph
12100 Commits
Author SHA1 Message Date
Jacob Vosmaer bf253a1087 Obtain lease before querying LDAP 2016-03-11 13:47: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
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
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 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 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
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 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
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
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 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 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
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
Jacob SchatzandRémy Coutable 11cb6e84fe Merge branch 'issue-sidebar-content-scrolling' into 'master'
Fixed issue with content in the issue sidebar disappearing

Closes #13626

See merge request !2919
2016-02-24 10:50:04 +01:00
Robert SpeicherandRémy Coutable 85f3dabefa Merge branch 'hudecof/show-crowd-login-form-when-signin-disabled' into 'master'
Show Crowd login even when sign-in is disabled

Fixes #13176.

See merge request !2749
2016-02-24 09:18:28 +01:00
Robert SpeicherandRémy Coutable 11b6c8c30b Merge branch 'fix-todos' into 'master'
Does not raise an error when Todo  is already marked as done

Closes #13681

See merge request !2926
2016-02-24 09:13:29 +01:00
Jacob SchatzandRémy Coutable dd94a4f780 Merge branch 'dz-small-ui-fixes' into 'master'
Set of UI fixes

* Improve wiki pages
* Improve profile pages

cc @skyruler

See merge request !2758
2016-02-23 16:53:26 +01:00
Jacob SchatzandRémy Coutable 1f368f2bc3 Merge branch 'milestone-drag-empty-list' into 'master'
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-23 14:08:29 +01:00
Rémy Coutable 08ac2f2956 Merge branch 'fix/13631-error-with-merged-mr' into 'master'
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-23 11:29:33 +01:00
Jacob SchatzandRémy Coutable 29ad1cedef Merge branch 'issue_13463' into 'master'
Fix Side-by-side view after loading diff results

Fixes #13463

See merge request !2880
2016-02-23 11:29:18 +01:00
Rémy Coutable b79c932b10 Merge branch 'fix-failing-issue-tests' into 'master'
Fixed failing issues tests

Also removed up/down vote icons from merge requests. Was missed from d8069bd858

See merge request !2911
2016-02-23 11:28:48 +01:00
Rémy Coutable 31986354ab Merge branch 'fix-zero-votes-showing-on-issue-list' into 'master'
Only show up or down votes icon on issue list if there are any

Closes #13649 

![Screen_Shot_2016-02-22_at_10.20.27](/uploads/21477426856dab9731bb110032025867/Screen_Shot_2016-02-22_at_10.20.27.png)

See merge request !2909
2016-02-22 11:25:20 +01:00
Douglas Barbosa AlexandreandRémy Coutable 41f1b3dede Merge branch 'tasks' into 'master'
Add Todos

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

Tasks:

-  Prepare database
 - [X] Create a new table (`todos`)
- Tasks Queue view
 - [X] Add a number icon showing the number of todos on the top right next to the new and logout button that will redirect the user to the todos page
 - [X] Add a chronological list of todos, with the 'Todos' tab active by default
 - [X] Add a 'Done' button to each todo
 - [x] Add filters (project, author, type, and action)
- Todos generation
 - [X] When user issue/mr is assgined to someone
 - [x] When user is mentioned on (issues/mr's/comments)
- Mark todo as `done`
 - [X] When clicks on the 'Done' button
 - [X] When edit issue/mr
 - [X] When left/edit a comment
 - [X] When reassign issue/mr
 - [X] When add/remove labels to issue/mr
 - [X] When issue/mr is closed
 - [X] When mr is merged
 - [X] When added an emoji
 - [X] When changed the issue/mr milestone

* Screenshot:

![Screenshot_2016-02-20_12.45.57](/uploads/4b2554b1bde25aed3347e1ae41e8e0c0/Screenshot_2016-02-20_12.45.57.png)

See merge request !2817
2016-02-22 08:47:44 +01:00
Douwe MaanandRémy Coutable b947661ce6 Merge branch 'merge-when-succeeded' into 'master'
Fix bugs in MergeWhenSucceeded

1. This fixes support for merge when succeeded for statuses without ref.
2. This fixes support for merge when succeeded for multiple stages. Stages are created after all builds for previous one are finished.

Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/9060 https://gitlab.com/gitlab-org/gitlab-ce/issues/8108 https://gitlab.com/gitlab-org/gitlab-ce/issues/12931 https://gitlab.com/gitlab-org/gitlab-ce/issues/13269

/cc @grzesiek @DouweM @rspeicher 


See merge request !2894
2016-02-22 08:47:20 +01:00
Jacob SchatzandRémy Coutable f79bb559e2 Merge branch 'award-emoji-retina' into 'master'
Award emoji supports retina displays

Based on discussion in !2800

There is now a retina spritesheet for emojis. It is 2mb, don't know how big an issue that is.

Before:

![Screen_Shot_2016-02-19_at_11.07.25](/uploads/ea412579bcaddfd13fce67bf583de61b/Screen_Shot_2016-02-19_at_11.07.25.png)

After:

![Screen_Shot_2016-02-19_at_11.07.36](/uploads/9d44c6278ba31987bad03dc1f46edd8b/Screen_Shot_2016-02-19_at_11.07.36.png)

Also updated the rake task to make the @2x spritesheet https://gitlab.com/snippets/15348

cc\ @rspeicher @vsizov 

See merge request !2891
2016-02-21 21:06:58 +01:00
Douwe MaanandRémy Coutable 20b3be6e24 Merge branch 'flush-cache-web-editor' into 'master'
Flush emptiness caches whenever needed



See merge request !2903
2016-02-21 21:06:44 +01:00
Douwe MaanandRémy Coutable 3d83a06356 Merge branch 'visibletrap/gitlab-ce-label' 2016-02-21 21:04:31 +01:00
Douwe MaanandRémy Coutable 5c120204ad Merge branch '12792-emoji-as-text-diff-comment' 2016-02-21 21:02:59 +01:00
Jacob SchatzandRémy Coutable 610a4f918c Merge branch 'issue_3276' into 'master'
Labels should be visible in milestone view

Closes #3276 

See merge request !2599
2016-02-19 20:56:00 +01:00
Kamil TrzcińskiandRémy Coutable 3d9943394e Merge branch 'commit-status-fix' into 'master'
Fix missing ignored? for GenericCommitStatus

This is pretty important fix. We should not release 8.5 without this.

It critical error when handling GenericCommitStatus:
```
undefined method `ignored?' for #<GenericCommitStatus:0x007fe1a2a20fe0>
```

cc @grzesiek 


See merge request !2899
2016-02-19 20:29:53 +01:00
Robert SpeicherandRémy Coutable 0daef5bfd7 Merge branch 'issue_3409' into 'master'
Add ability to revert changes introduced by Merge Requests or Commits

Closes #3409 

See merge request !1990
2016-02-19 19:55:19 +01:00
Rémy Coutable 441896589e Merge branch 'bugfix/jschatz1/issuable-consistency' into 'master'
Consistency in MR and issue header.

Fixes: #13550 

![Screen_Shot_2016-02-18_at_11.20.19_AM](/uploads/8327ff045e45029b85b2cbac72c98a7f/Screen_Shot_2016-02-18_at_11.20.19_AM.png)![Screen_Shot_2016-02-18_at_11.20.55_AM](/uploads/f79613ebb23e4a62fb1bdb48d6f7fd2b/Screen_Shot_2016-02-18_at_11.20.55_AM.png)

See merge request !2874
2016-02-19 19:32:55 +01:00
Grzegorz BizonandRémy Coutable 62067b74c8 Merge branch 'ci/remove-builds' into 'master'
Make it possible to erase build content (artifacts, trace)

This feature makes it possible to remove build content - build artifacts and build traces.

- [x] Remove artifacts
- [x] Remove metadata
- [x] Remove build traces
- [x] Wait for https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 this to be merged
- [x] Fix the permissions after the merge

Closes #3421

See merge request !2560
2016-02-19 18:22:49 +01:00
Rémy Coutable 64f1bab66e Merge branch 'axil/gitlab-ce-mention-project-in-fork-notice' into 'master'
Mention project name in fork notice

_Originally opened at !1186 by @axil._

- - -

I missed this one in !1070

See merge request !2897
2016-02-19 17:41:06 +01:00
Patricio CanoandRémy Coutable c1921fb510 Merge branch 'saml-decoupling' into 'master' 2016-02-19 16:45:18 +01:00
Kamil TrzcińskiandRémy Coutable 778da50251 Merge branch 'ci/api-runners' into 'master'
Add runners API

References #4264

See merge request !2640
2016-02-19 16:32:43 +01:00
Jacob SchatzandRémy Coutable 7238e7d17e Merge branch 'issue_11872' into 'master'
Put project visibility icon next to title

Fixes #11872

See merge request !2885
2016-02-19 16:32:24 +01:00
Douwe MaanandRémy Coutable 105f12c33a Merge branch '12791-hide-project-limit-reached-warning' into 'master'
Project limit is reached warning is hidden when the projects_limit is zero

Fixes #12791

See merge request !2890
2016-02-19 16:30:34 +01:00