summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Instrument Rails cache codeinstrument-rails-cacheYorick Peterse2016-04-081-0/+39
| | | | | This allows us to track how much time of a transaction is spent in dealing with cached data.
* API: Expose subscribed? on issuesRobert Schilling2016-04-084-13/+21
|
* Merge branch 'api-filter-milestone' into 'master' Rémy Coutable2016-04-071-2/+18
|\ | | | | | | | | | | | | | | | | API: Ability to filter milestones by state Ability to filter milestones by `active` and `closed` state. * Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14931 See merge request !3566
| * Improve coding and doc styleRobert Schilling2016-04-061-1/+1
| |
| * API: Ability to filter milestones by stateRobert Schilling2016-04-061-2/+18
| |
* | Merge branch 'feature/expose-builds-badge' into 'master' Rémy Coutable2016-04-071-4/+26
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose badges This MR exposes badge somewhere in visible place. ![expose_badges](/uploads/d2e290d3013d1ef2b1bdeebbbe2c5d8b/expose_badges.png) Closes #13801 See merge request !3326
| * | Extend build status badge, add html/markdown methodsGrzegorz Bizon2016-04-061-4/+26
| |/
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqRobert Schilling2016-04-071-1/+1
|\ \
| * | Changed the argument of not_found for 'unprotect'Yasser Hussain2016-04-061-1/+1
| | | | | | | | | | | | | | | not_found appends string "Not Found" to the argument causing the resulting message to be "Branch does not exist Not Found" which is an incorrect error message. Changed the argument of not_found! for 'unprotect' command to "Branch" from "Branch does not exist". This makes the final error message to appear as "Branch Not Found" which is correct and same as error messages for other commands like 'protect'.
* | | Merge branch 'saml-external-groups' into 'master' Robert Speicher2016-04-073-2/+64
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow SAML to identify external users and set them as such Related to #4009 Fixes #14577 This allows SAML to retrieve group information form the `SAML Response` and match that to a setting that will flag all matching users as external. See merge request !3530
| * | | Implemented suggested fixesPatricio Cano2016-04-063-6/+4
| | | |
| * | | Added CHANGELOG itemsaml-external-groupsPatricio Cano2016-04-061-1/+0
| | | |
| * | | Fix error that was causing only one group to be returned and corrected specs ↵Patricio Cano2016-04-061-1/+3
| | | | | | | | | | | | | | | | to use the proper attribute type
| * | | Changed config syntax and improved how chaanges in group memberships are ↵Patricio Cano2016-04-052-29/+14
| | | | | | | | | | | | | | | | handled when external groups is set up
| * | | Prepare SAML for group retrievalPatricio Cano2016-04-043-2/+80
| | | |
* | | | Merge branch 'patch/fix-markdown-preview-wikis' into 'master' Robert Speicher2016-04-073-6/+70
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wiki preview URL converting problem [via Markdown] Current implementation when rendering the preview, thinks relative links are for project repository files. We are creating a new preview route that will define correct context data to render for wikis instead. Fixes #2380, #1184 See merge request !3461
| * | | | little refactor and improvements on specsGabriel Mazetto2016-04-061-6/+2
| | | | |
| * | | | Ensure correct filter order to validate with our markdown specpatch/fix-markdown-preview-wikisGabriel Mazetto2016-04-062-3/+7
| | | | |
| * | | | Fix a few edited references from WikiLinkFilter and specsGabriel Mazetto2016-04-061-2/+6
| | | | |
| * | | | Fixed WikiPipeline and specsGabriel Mazetto2016-04-061-1/+1
| | | | |
| * | | | Added WikiLinkFilterGabriel Mazetto2016-04-012-2/+56
| | | | |
| * | | | Fixed Gollum pages link url expansion to render correctly in previewGabriel Mazetto2016-03-301-3/+9
| | | | |
* | | | | Merge branch 'patch/fix-ldap-unblock-user-logic' into 'master' Robert Speicher2016-04-061-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unblocks user when active_directory is disabled and it can be found We implemented a specific block state to handle user blocking that originates from LDAP filtering rules / directory state in !2242. That introduced a regression in LDAP authentication when Active Directory support was disabled. You could have a scenario where the user would not be temporarily found (like a filtering rule), that would mark the user as `ldap_blocked`, but will never unblock it automatically when that state changed. Fixes #14253, #13179, #13259, #13959 See merge request !3550
| * | | | | Unblocks user when active_directory is disabled and it can be foundpatch/fix-ldap-unblock-user-logicGabriel Mazetto2016-04-051-1/+4
| |/ / / /
* | | | | Merge branch 'fix-markdown-rendering' into 'master' Douwe Maan2016-04-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix header link rendering when containing numbers This fixes the problem where Markdown such as: ### 31st Would get rendered as a link tag pointing to issue number 31 inside a header tag. See gitlab-org/gitlab-ce#14936 for more information. cc @rspeicher See merge request !3568
| * | | | | Fix header link rendering when containing numbersfix-markdown-renderingYorick Peterse2016-04-061-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the problem where Markdown such as: ### 31st Would get rendered as a link tag pointing to issue number 31 inside a header tag. See gitlab-org/gitlab-ce#14936 for more information.
* | | | | Revert "API: Ability to retrieve a single tag"Robert Schilling2016-04-061-14/+0
| |_|_|/ |/| | | | | | | | | | | This reverts commit 7f287c9136d5d1cdda8df170c6e772ca82aad1e9.
* | | | Merge branch 'metrics-measure-block' into 'master' Robert Speicher2016-04-061-0/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for measuring Ruby blocks using GitLab performance monitoring This adds support for measuring timings of arbitrary Ruby blocks. Fixes #14710 See merge request !3515
| * | | | Measure Ruby blocks using Gitlab::MetricsYorick Peterse2016-04-061-0/+26
| |/ / / | | | | | | | | | | | | | | | | | | | | This allows measuring of timings of arbitrary Ruby blocks, this allows for more fine grained performance monitoring. Custom values and tags can also be attached to a block.
* | | | Expose user location in APIRobert Schilling2016-04-062-3/+5
| | | |
* | | | API: Ability to retrieve a single tagRobert Schilling2016-04-061-0/+14
|/ / /
* | | Wrap images in discussions and wikis with a link to the image source using ↵connorshea2016-04-042-0/+28
| |/ |/| | | | | | | | | | | | | ImageLinkFilter. Resolves #14411. See merge request !3464
* | Cleaned up caching in AbstractReferenceFilterYorick Peterse2016-04-041-15/+11
| | | | | | | | | | Cleaning this up any further is a bit tricky as the caches in question should only be evaluated if RequestStore is actually enabled.
* | Cache default_issues_tracker? in BanzaiYorick Peterse2016-04-041-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Memoize object class titlesYorick Peterse2016-04-041-1/+9
| | | | | | | | | | For an issue with around 200 notes this cuts down timings by around 150 milliseconds.
* | Cache Banzai class methods returning static dataYorick Peterse2016-04-041-3/+3
| | | | | | | | | | These methods always return the same data for every class so there's no point in computing their values on every call.
* | Refactor processing of various Banzai filtersYorick Peterse2016-04-044-134/+120
| | | | | | | | | | | | | | 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.
* | Cache Banzai projects/objects using RequestStoreYorick Peterse2016-04-041-4/+67
| | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'add-ability-to-archive-a-project-via-api-14296' into 'master' Douwe Maan2016-04-031-0/+28
|\ \ | | | | | | | | | | | | | | | | | | Add endpoints for archiving and unarchiving Closes #14296 See merge request !3372
| * \ Merge branch 'master' into add-ability-to-archive-a-project-via-api-14296add-ability-to-archive-a-project-via-api-14296Zeger-Jan van de Weg2016-03-291-6/+10
| |\ \
| * \ \ Merge branch 'master' into add-ability-to-archive-a-project-via-api-14296Zeger-Jan van de Weg2016-03-241-0/+21
| |\ \ \
| * | | | PUT becomes POST on archiving endpointsZeger-Jan van de Weg2016-03-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Also the specs have a minor improvement. Mainly the access right spec. Changes are reflected in the docs
| * | | | Add endpoints for archiving and unarchivingZeger-Jan van de Weg2016-03-231-0/+28
| | | | |
* | | | | Merge branch 'routing' into 'master' Robert Speicher2016-04-0111-11/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added & use Gitlab::Routing for URL helpers Extracted from !3389 See merge request !3486
| * | | | | Added & use Gitlab::Routing for URL helpersroutingYorick Peterse2016-04-0111-11/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails' "url_helpers" method creates an anonymous Module (which a bunch of methods) on every call. By caching the output of this method in a dedicated method we can shave off about 10 seconds of loading time for an issue with around 200 comments.
* | | | | | Merge branch 'fix/fogbugz-import' into 'master' Robert Speicher2016-04-011-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spec and fix for fogbugz lonely user problem Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14766 I encountered this issue while manually testing all import types for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3066 This is really due to a horrible API ``` { 'people' => { 'person' => array_of_people_or_single_person_as_hash } } ``` See merge request !3457
| * | | | | | spec and fix for fogbugz lonely user problemJames Lopez2016-03-301-1/+1
| | | | | | |
* | | | | | | Merge branch ↵Douwe Maan2016-04-012-9/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'snippets-with-comments-cause-a-500-when-they-show-up-in-search-results-14764' into 'master' Fix Error 500 when searching for a comment in a project snippet Closes #14764. /cc @stanhu, and thank you for the spec! ;) See merge request !3468
| * | | | | | | Fix view of notes in search results when noteable is a snippetsnippets-with-comments-cause-a-500-when-they-show-up-in-search-results-14764Rémy Coutable2016-03-311-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, streamline the view. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Rename Note#for_project_snippet? to #for_snippet?Rémy Coutable2016-03-312-2/+2
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>