Commit Graph
26178 Commits
Author SHA1 Message Date
Patricio Cano 3a36fa8957 Fix error that was causing only one group to be returned and corrected specs to use the proper attribute type 2016-04-06 16:03:35 -05:00
Patricio Cano 7efaf22bcc Removed extra LDAP tests and added tests for the external groups feature 2016-04-05 19:22:58 -05:00
Patricio Cano 518ec6b266 Changed config syntax and improved how chaanges in group memberships are handled when external groups is set up 2016-04-05 19:20:18 -05:00
Patricio Cano e99855bfe4 Avoid saving again if the user attributes haven't changed 2016-04-04 19:10:59 -05:00
Patricio Cano 943d8d4b90 Config examples 2016-04-04 19:10:17 -05:00
Patricio Cano d14f080c0a Remove unnecessary LDAP tests from SAML tests 2016-04-04 19:09:46 -05:00
Patricio Cano 1a168279fa Prepare SAML for group retrieval 2016-04-04 19:09:12 -05:00
Jacob Schatz 6713600793 Merge branch 'remove-2fa-status' into 'master'
Remove 2FA status on enable page

The 2FA status on the enabling page is useless, since it always is `disabled`. A user is enabling 2FA, so he already knows that it is disabled.

### Before

![Screenshot_2016-03-29_12.41.27](/uploads/4800a13a82f176077a11ecaf13ed0cb1/Screenshot_2016-03-29_12.41.27.png)

### After
![Screenshot_2016-03-29_12.40.55](/uploads/a77e8acd7cf99190bbd6bd340542ad10/Screenshot_2016-03-29_12.40.55.png)

See merge request !3436
2016-04-04 23:14:04 +00:00
Dmitriy Zaporozhets 8f9586421d Merge branch 'admin-pages-layout' into 'master'
Improve UI for admin/groups page

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

cc @jschatz1 @skyruler 

See merge request !3523
2016-04-04 22:25:06 +00:00
Dmitriy Zaporozhets be6f1c7427 Single quotes paradise
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-04 23:52:27 +02:00
Yorick Peterse a55fc41657 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-04-04 22:56:19 +02:00
Jacob Schatz 638012c23f Merge branch 'dz-admin-area-fixes' into 'master'
Set of UI fixes for admin area



See merge request !3525
2016-04-04 20:01:46 +00:00
Yorick Peterse b530cabd78 Merge branch 'fix-forked-project-link-specs' into 'master'
Reload forked_project_link projects

See merge request !3526
2016-04-04 19:57:48 +00:00
Jacob Schatz c653b1b488 Merge branch 'hide_profile_activity_on_mobile' into 'master'
Hide user profile activity graph on mobile

closes #14507 

## Before
![Screen_Shot_2016-03-26_at_10.28.21_PM](/uploads/5d5e2f77de936c2f2cd8a95132720a81/Screen_Shot_2016-03-26_at_10.28.21_PM.png)

## After
![Screen_Shot_2016-03-26_at_10.27.01_PM](/uploads/c011497b31368a0b7aa7d851541ac301/Screen_Shot_2016-03-26_at_10.27.01_PM.png)

## Medium width screen
![fix2](/uploads/2a5eb2d01f1a516991cd3e2b35b8aadc/fix2.gif)

See merge request !3412
2016-04-04 19:52:55 +00:00
Jacob Schatz 1926e55e1f Merge branch 'hide_profile_activity_on_mobile' into 'master'
Hide user profile activity graph on mobile

closes #14507 

## Before
![Screen_Shot_2016-03-26_at_10.28.21_PM](/uploads/5d5e2f77de936c2f2cd8a95132720a81/Screen_Shot_2016-03-26_at_10.28.21_PM.png)

## After
![Screen_Shot_2016-03-26_at_10.27.01_PM](/uploads/c011497b31368a0b7aa7d851541ac301/Screen_Shot_2016-03-26_at_10.27.01_PM.png)

## Medium width screen
![fix2](/uploads/2a5eb2d01f1a516991cd3e2b35b8aadc/fix2.gif)

See merge request !3412
2016-04-04 19:52:31 +00:00
Jacob Schatz 2fb0ef51d6 Merge branch 'fix-award-emoji-menu' into 'master'
Fix award emoji picker for relative_url

MR !2888 caused a regression where the emoji picker does not load when
using relative_url, because the path for the controller was hardcoded.

See merge request !3493
2016-04-04 19:47:15 +00:00
Yorick Peterse 6e0f8453c0 Reload forked_project_link projects
This fixes ./spec/services/projects/unlink_fork_service_spec.rb which
somehow started failing on the master branch. It certainly isn't a very
elegant solution but seems to be the easiest/best way of solving this
problem for the time being.
2016-04-04 21:05:51 +02:00
Jacob Schatz d5169a60d4 Merge branch '14083-build-labels' into 'master'
Add labels to block element

Fixes #14083 


Before:![Screen_Shot_2016-04-04_at_11.22.27_AM](/uploads/c35afd95ebca1b72f2aa37c72dc3c1a9/Screen_Shot_2016-04-04_at_11.22.27_AM.png)

After: ![Screen_Shot_2016-04-04_at_11.21.34_AM](/uploads/94f180858cf8fe2fc7eeec541ce66d44/Screen_Shot_2016-04-04_at_11.21.34_AM.png)

See merge request !3492
2016-04-04 18:29:40 +00:00
Dmitriy Zaporozhets f9fd003159 Fix missing paddings in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-04 19:41:31 +02:00
Dmitriy Zaporozhets 3e6d27ee59 Dont use monospace font for names
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-04 19:36:21 +02:00
Dmitriy Zaporozhets 531e4bdac8 Merge branch 'fix-ui-event' into 'master'
Fix event rendering when create project

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

cc @jschatz1 

See merge request !3522
2016-04-04 17:32:30 +00:00
Dmitriy Zaporozhets d5fadfe0f5 Improve UI for admin/groups page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-04 19:23:50 +02:00
Dmitriy Zaporozhets 11c1dda35f Fix event rendering when create project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-04 18:59:04 +02:00
Douwe Maan f505c753b0 Merge branch 'fix_remove_fork_link' into 'master'
Remove fork link closes all merge requests opened on source project

Currently, if you:

- create a fork
- open a merge request on the source project
- remove the fork link

The created MR cannot be closed.

With this MR, all pending MR is closed when the fork link is removed.

See merge request !3189
2016-04-04 15:37:08 +00:00
Dmitriy Zaporozhets 5e8740eef0 Merge branch 'fix-sidebar-exapnd' into 'master'
Fix transparent bg for expand sidebar button

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

For #14838 

cc @jschatz1 

See merge request !3520
2016-04-04 15:34:46 +00:00
Dmitriy Zaporozhets 1be3c634c8 Fix transparent bg for expand sidebar button
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-04 16:58:35 +02:00
Baldinof a6b5b50e14 Fix incorrect variable name 2016-04-04 14:41:01 +00:00
Douwe Maan ba7fcc9866 Merge branch 'update_repository_from_ee' into 'master'
Migrate Repository#local_branches from gitlab-ee.

REF: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/249

This will help us to avoid posible merge conflicts when merging
gitlab-ce to gitlab-ee

See merge request !3496
2016-04-04 14:25:15 +00:00
Jacob Schatz df77df46f5 Merge branch 'space-before-brace-scss-lint' into 'master'
Enable SpaceBeforeBrace rule for SCSS Lint

Also resolve all instances of spaces not being included before opening braces.

See merge request !3463
2016-04-04 13:56:10 +00:00
Rémy Coutable e014fe0426 Add 8.6.4 changelog item
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-04 15:27:58 +02:00
Rémy Coutable 41c478cb8f Merge branch 'fix-mr-for-orphaned-branches' into 'master'
Fix creation of merge requests for orphaned branches with images

When attempting to create a merge request from an orphaned branch (e.g. this happens for the first commit of any repo) that contained images, GitLab would fail with a Error 500. This MR fixes that problem.

Closes #14875

See merge request !3511
2016-04-04 13:14:58 +00:00
Yorick Peterse 438e0ce848 Merge branch '8.7-rc1' into 'master'
Added 8.7 install/update guides

See merge request !3517
2016-04-04 12:40:24 +00:00
Yorick Peterse 6ddfd49669 Added 8.7 install/update guides
[ci skip]
2016-04-04 14:36:47 +02:00
Stan Hu 7877138958 Fix creation of merge requests for orphaned branches
Closes #14875
2016-04-04 04:51:05 -07:00
Douwe Maan 4bf302799f Merge branch 'banzai-webscale' into 'master'
Improve rendering performance of Banzai

Related issues:

* gitlab-org/gitlab-ce#14315
* gitlab-org/gitlab-ce#13651

TODO:

* [x] `Banzai::Filter::ExternalIssueReferenceFilter#call` calls `Project#default_issues_tracker?` which runs a query on every call. Memoizing this only works if the `Project` instance is shared between instances of this filter. Either way it should at most only run this method once.
* [x] Fix the two failing specs
* [x] Clean of the various `call` methods in the filters where I inlined methods
* [x] Remove the `replace_XXX` methods in ReferenceFilter now that they're no longer used.

See merge request !3389
2016-04-04 10:14:56 +00:00
Yorick Peterse 915fd3f910 Cleaned up caching in AbstractReferenceFilter
Cleaning this up any further is a bit tricky as the caches in question
should only be evaluated if RequestStore is actually enabled.
2016-04-04 11:39:11 +02:00
Yorick Peterse 3dd91f55a0 Merge branch 'issue_14853' into 'master'
Fix bug related to filtering Issues by Label/Milestone.

See merge request !3499
2016-04-04 09:05:57 +00:00
Yorick Peterse ede351a99e Added CHANGELOG entry for Markdown performance 2016-04-04 10:44:35 +02:00
Yorick Peterse 7f0fd73eeb Cache default_issues_tracker? in Banzai
Every object processed by ExternalIssueReferenceFilter can return a
different Project instance when calling "project". For example, every
note processed will have it's own associated Project. If we were to
cache Project#default_issues_tracker? on Project level this would have
no impact on Markdown rendering timings as the cache would have to be
built for every Project instance without it ever being re-used.

To work around this we cache Project#default_issues_tracker? in
Banzai::Filter::ExternalIssueReferenceFilter using the project's _id_
instead of the whole object. This setup allows re-using of the cached
data even when the Project instances used are different, as long as the
actual project IDs are the same.
2016-04-04 10:44:35 +02:00
Yorick Peterse 9fa94326db Memoize object class titles
For an issue with around 200 notes this cuts down timings by around 150
milliseconds.
2016-04-04 10:44:35 +02:00
Yorick Peterse 8c49eaa937 Cache Banzai class methods returning static data
These methods always return the same data for every class so there's no
point in computing their values on every call.
2016-04-04 10:44:35 +02:00
Yorick Peterse 1411480577 Refactor processing of various Banzai filters
These filters now use a single iteration over all the document nodes
instead of multiple ones. This in turn allows variables to be re-used
(e.g. links only have to be unescaped once). Combined with some other
refactoring this can drastically reduce render timings.
2016-04-04 10:44:35 +02:00
Yorick Peterse 57bde0ce65 Cache Banzai projects/objects using RequestStore
This was originally suggested by @ayufan and modified to be a bit
cleaner and use RequestStore instead of a regular Hash.

By caching the output of the two methods involved the number of queries
is reduced significantly. For example, for an issue with 200 notes (of
which 100 reference a number of merge requests) this cuts down the
amount of queries from around 6300 to around 3300.
2016-04-04 10:44:35 +02:00
Baldinof 65fa716173 Fix rubocop in unlink fork service specs 2016-04-03 15:17:14 +00:00
Douwe Maan fee7ad8627 Merge branch 'build-updates' into 'master'
Build updates

Fixes #10851 

![build-updates](/uploads/52e09e679ca457f3d818f9a12fd8382b/build-updates.gif)


See merge request !2604
2016-04-03 13:22:27 +00:00
Douwe Maan df725aec98 Merge branch 'add-ability-to-archive-a-project-via-api-14296' into 'master'
Add endpoints for archiving and unarchiving

Closes #14296

See merge request !3372
2016-04-03 13:19:25 +00:00
Douwe Maan 136267dd35 Merge branch 'fix-bad-fetch' into 'master'
Don't fetch any tags from a forked repo

Closes #13957

See merge request !3504
2016-04-03 12:17:43 +00:00
Rubén Dávila fd090a2fab Fix bug related to filtering Issues by Label/Milestone.
This problem only was affecting the dev env.
2016-04-02 07:36:41 -05:00
Dmitriy Zaporozhets 2ed6cd9e46 Merge branch 'new-navigation-prototype' into 'master'
Two level hierarchy  in navigation sidebar

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

See merge request !3494
2016-04-02 10:20:17 +00:00
Dmitriy Zaporozhets 31b27adeb8 Fix milestones tab active state and tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-02 11:26:46 +02:00