summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'decouple-member-notification' into 'master' Douwe Maan2016-04-121-5/+10
|\
| * Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-117-53/+138
| |\
| * \ Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-0842-232/+711
| |\ \
| * | | Update API to use notification_level from notification_settingDmitriy Zaporozhets2016-03-301-5/+10
* | | | Merge branch 'fix-missing-saml-error-handling' into 'master' Robert Speicher2016-04-121-1/+2
|\ \ \ \
| * | | | Better control flow and added guard clause.fix-missing-saml-error-handlingPatricio Cano2016-04-111-14/+9
| * | | | Add missing proper nil and error handling to SAML login process.Patricio Cano2016-04-071-8/+14
* | | | | Merge branch 'api-delete-note' into 'master' Rémy Coutable2016-04-121-0/+17
|\ \ \ \ \
| * | | | | Adapt tests to new testing guidelinesRobert Schilling2016-04-121-0/+2
| * | | | | Fix code review issuesRobert Schilling2016-04-121-4/+2
| * | | | | Delete notes via APIRobert Schilling2016-04-121-0/+17
* | | | | | Merge branch 'api-get-tag' into 'master' Rémy Coutable2016-04-121-0/+14
|\ \ \ \ \ \
| * | | | | | Fix minor styling issues from code reviewRobert Schilling2016-04-121-3/+3
| * | | | | | API: Ability to retrieve a single tagRobert Schilling2016-04-121-0/+14
* | | | | | | Allow a project member to leave the projected through the APIremove-myself-from-project-api-7687Zeger-Jan van de Weg2016-04-121-4/+9
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'api-fix-milestone-iid-filter' into 'master' Rémy Coutable2016-04-121-0/+2
|\ \ \ \ \ \
| * | | | | | API: Add iid filter to milestonesRobert Schilling2016-04-121-0/+2
| |/ / / / /
* | | | | | API: Expose updated_at for notesRobert Schilling2016-04-121-1/+1
|/ / / / /
* | | | | Merge branch 'api-labels-info' into 'master' Rémy Coutable2016-04-121-0/+1
|\ \ \ \ \
| * | | | | API: Expose open_issues_count, closed_issues_count, open_merge_requests_count...Robert Schilling2016-04-061-0/+1
* | | | | | Instrument Banzai codeYorick Peterse2016-04-111-8/+12
| |_|_|_|/ |/| | | |
* | | | | 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 '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