summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into feature/gb/manual-actions-protected-branches-permi...Grzegorz Bizon2017-04-2236-160/+299
|\
| * Start versioning cached markdown fieldsNick Thomas2017-04-211-14/+7
| * Remove the ClearDatabaseCacheWorkerNick Thomas2017-04-211-6/+1
| * Fix Gitlab::Metrics metaprogramming magicNick Thomas2017-04-211-5/+5
| * Remove a use of module_functionNick Thomas2017-04-211-12/+10
| * Merge branch 'fix/encoding-issue' into 'master' Sean McGivern2017-04-211-1/+7
| |\
| | * Return empty string on UTF8 conversion with U_STRING_NOT_TERMINATED_WARNING e...fix/encoding-issueJames Lopez2017-04-201-1/+7
| * | Merge branch 'fix-jobs-enabled-parameter' into 'master'Sean McGivern2017-04-211-2/+5
| |\ \
| | * | Replace builds_enabled with jobs_enabled in projects API v4 (!10786)winniehell2017-04-201-2/+5
| * | | Merge branch 'add-email-receiver-metrics' into 'master' Douwe Maan2017-04-203-4/+8
| |\ \ \ | | |_|/ | |/| |
| | * | Store projects in metrics for email repliesSean McGivern2017-04-202-4/+4
| | * | Add metrics events for incoming emailsSean McGivern2017-04-201-0/+4
| * | | Merge branch 'issuable-state-custom-links' into 'master' Sean McGivern2017-04-201-2/+2
| |\ \ \
| | * | | Do not append issuable state to links with custom anchorissuable-state-custom-linksAdam Niedzielski2017-04-191-2/+2
| | |/ /
| * | | Merge branch 'plantuml-filter-after-highlight' into 'master' Sean McGivern2017-04-201-4/+4
| |\ \ \
| | * | | Fix PlantUML integration in GFMplantuml-filter-after-highlightAdam Niedzielski2017-04-191-4/+4
| * | | | Use constants in Gitlab::MarkupHelperDouwe Maan2017-04-201-9/+16
| * | | | Refactor changing files in web UIDouwe Maan2017-04-206-39/+42
| * | | | Merge branch 'query-users-by-extern-uid' into 'master'Robert Speicher2017-04-191-8/+14
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Implement search by extern_uid in Users APIRobin Bobbitt2017-04-181-8/+14
| * | | | Merge branch 'issuable-state-only-notes-and-description' into 'master' Sean McGivern2017-04-191-0/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Display issuable state only in notes and issuable descriptionAdam Niedzielski2017-04-191-0/+2
| * | | | Merge branch 'usage-ping-port' into 'master' Sean McGivern2017-04-197-1/+130
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Remove unused user activities codeSean McGivern2017-04-144-78/+1
| | * | | Expose `last_activity_on` in the User APIRémy Coutable2017-04-142-9/+9
| | * | | Add a new Gitlab::UserActivities class to track user activitiesRémy Coutable2017-04-143-83/+34
| | * | | Port 'Add user activities API' to CESean McGivern2017-04-146-1/+172
| | * | | Remove user activities table and use redis instead of PG for recording activi...James Lopez2017-04-141-0/+7
| | * | | Add user activity service and spec. Also added relevant - NOT offline - migra...James Lopez2017-04-141-0/+12
| | * | | Add prometheus services to usage pingSean McGivern2017-04-141-0/+1
| | * | | Add edition to usage pingSean McGivern2017-04-141-5/+8
| | * | | Add Upload count to usage dataRobert Speicher2017-04-141-0/+1
| | * | | Used named parameter for refreshing usage dataStan Hu2017-04-141-4/+4
| | * | | Cache the last usage data to avoid unicorn timeoutsStan Hu2017-04-141-4/+4
| | * | | Port 'Add uuid to usage ping' to CESean McGivern2017-04-141-1/+4
| | * | | Track Mattermost usageZ.J. van de Weg2017-04-141-1/+2
| | * | | Remove pushes count from usage ping payloadRuben Davila2017-04-141-1/+0
| | * | | Port 'Add more usage data to EE ping' to CESean McGivern2017-04-141-0/+57
| * | | | Fix duplicated container repository namesGrzegorz Bizon2017-04-181-2/+8
| | |/ / | |/| |
| * | | Merge branch 'fix/improve-gitaly-unsupported-address-error' into 'master' Robert Speicher2017-04-181-1/+1
| |\ \ \
| | * | | Improve gitaly_address error messagefix/improve-gitaly-unsupported-address-errorAhmad Sherif2017-04-081-1/+1
| * | | | Improves support for long build traces:Filipa Lacerda2017-04-181-1/+1
| * | | | Use &. because rubocop. Seriously I don't think this makes senseLin Jen-Shin2017-04-181-1/+1
| * | | | Just enforce the output encoding for Ansi2htmlLin Jen-Shin2017-04-182-11/+4
| * | | | Merge branch 'dm-git-blob-sizes' into 'master' Robert Speicher2017-04-181-2/+2
| |\ \ \ \
| | * | | | Normalize sizes in Gitlab::Git::BlobDouwe Maan2017-04-171-2/+2
| * | | | | Does not remove the GitHub remote when importing from GitHubDouglas Barbosa Alexandre2017-04-181-1/+0
| |/ / / /
| * | | | Set the encoding in c'tor and explain why it's finefix-trace-encodingLin Jen-Shin2017-04-171-8/+8
| * | | | Only set the encoding before passing to Ansi2htmlLin Jen-Shin2017-04-172-5/+8
| * | | | Don't try to read if there's no traceLin Jen-Shin2017-04-171-0/+2