summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-117-53/+138
|\
| * Fixed stubbing for Gitlab::Metrics specsYorick Peterse2016-04-111-4/+12
| * Track call counts in Gitlab::Metrics.measure_blockmetrics-measure-block-transactionYorick Peterse2016-04-111-0/+1
| * Store block timings as transaction valuesYorick Peterse2016-04-112-9/+25
| * Merge branch 'redis-connection-pool' into 'master' Robert Speicher2016-04-084-43/+64
| |\
| | * Put CACHE_NAMESPACE in the Gitlab::Redis moduleJacob Vosmaer2016-04-072-1/+3
| | * Be careful when setting class instance varsJacob Vosmaer2016-04-041-2/+13
| | * Add Gitlab::Redis connection poolJacob Vosmaer2016-04-043-16/+24
| * | Merge branch 'instrument-rails-cache' into 'master' Yorick Peterse2016-04-081-0/+39
| |\ \
| | * | Instrument Rails cache codeinstrument-rails-cacheYorick Peterse2016-04-081-0/+39
* | | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-0842-232/+711
|\ \ \ \ | |/ / /
| * | | Merge branch 'metrics-timestamp-precision' into 'master' Yorick Peterse2016-04-081-1/+21
| |\ \ \ | | |/ / | |/| |
| | * | Use more accurate timestamps for InfluxDB.metrics-timestamp-precisionYorick Peterse2016-04-081-1/+21
| * | | API: Expose subscribed? on issuesRobert Schilling2016-04-084-13/+21
| |/ /
| * | Merge branch 'api-filter-milestone' into 'master' Rémy Coutable2016-04-071-2/+18
| |\ \
| | * | 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
| |\ \ \
| | * | | 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
| * | | | 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
View Lorry Controller Status