summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'saml-external-groups' into 'master' Robert Speicher2016-04-073-2/+64
|\
| * 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
| * Changed config syntax and improved how chaanges in group memberships are han...Patricio Cano2016-04-052-29/+14
| * 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
|\ \
| * | 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 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 numbersfix-markdown-renderingYorick Peterse2016-04-061-1/+1
* | | | Revert "API: Ability to retrieve a single tag"Robert Schilling2016-04-061-14/+0
* | | | Merge branch 'metrics-measure-block' into 'master' Robert Speicher2016-04-061-0/+26
|\ \ \ \
| * | | | Measure Ruby blocks using Gitlab::MetricsYorick Peterse2016-04-061-0/+26
| |/ / /
* | | | 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 Im...connorshea2016-04-042-0/+28
| |/ |/|
* | Cleaned up caching in AbstractReferenceFilterYorick Peterse2016-04-041-15/+11
* | Cache default_issues_tracker? in BanzaiYorick Peterse2016-04-041-1/+16
* | Memoize object class titlesYorick Peterse2016-04-041-1/+9
* | Cache Banzai class methods returning static dataYorick Peterse2016-04-041-3/+3
* | Refactor processing of various Banzai filtersYorick Peterse2016-04-044-134/+120
* | Cache Banzai projects/objects using RequestStoreYorick Peterse2016-04-041-4/+67
* | Merge branch 'add-ability-to-archive-a-project-via-api-14296' into 'master' Douwe Maan2016-04-031-0/+28
|\ \
| * \ 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
| * | | | 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 helpersroutingYorick Peterse2016-04-0111-11/+24
* | | | | | Merge branch 'fix/fogbugz-import' into 'master' Robert Speicher2016-04-011-1/+1
|\ \ \ \ \ \
| * | | | | | spec and fix for fogbugz lonely user problemJames Lopez2016-03-301-1/+1
* | | | | | | Merge branch 'snippets-with-comments-cause-a-500-when-they-show-up-in-search-...Douwe Maan2016-04-012-9/+7
|\ \ \ \ \ \ \
| * | | | | | | 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
| * | | | | | | Rename Note#for_project_snippet? to #for_snippet?Rémy Coutable2016-03-312-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'fix/issue-move-rewrite-uploads' into 'master' Douwe Maan2016-04-012-2/+58
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into fix/issue-move-rewrite-uploadsGrzegorz Bizon2016-03-316-35/+102
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Remove reduntant `move_to_store` overrideGrzegorz Bizon2016-03-301-8/+2
| * | | | | | | Add method that returns markdown in file uploaderGrzegorz Bizon2016-03-302-2/+2
| * | | | | | | Check if GFM rewriters need rewrite internallyGrzegorz Bizon2016-03-302-1/+3
| * | | | | | | Refactor uploads rewriter used when moving issueGrzegorz Bizon2016-03-302-13/+17
| * | | | | | | Add uploads rewriter and use it when moving issueGrzegorz Bizon2016-03-301-0/+56
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Remove "Congratulations!" tweet button on newly-created project.connorshea2016-03-312-2/+0
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'precompile-emoji-urls' into 'master' Dmitriy Zaporozhets2016-03-302-14/+53
|\ \ \ \ \ \