summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Make sure @stream.each_line would tag Encoding.default_externalLin Jen-Shin2017-04-171-0/+2
* | | | Make sure we're giving Encoding.default_externalLin Jen-Shin2017-04-171-2/+2
* | | | Fix regression in rendering Markdown references that do not existsh-fix-base-parserStan Hu2017-04-151-1/+2
| |/ / |/| |
* | | Merge branch '30349-create-users-build-service' into 'master' Rémy Coutable2017-04-141-1/+1
|\ \ \
| * | | Implement Users::BuildServicegeoandri2017-04-131-1/+1
* | | | Merge branch 'branch-versions' into 'master' Rémy Coutable2017-04-144-34/+22
|\ \ \ \
| * | | | Expand components version specification format to allow branchesbranch-versionsAlejandro Rodríguez2017-04-134-34/+22
* | | | | Merge branch 'fix-appending-state-to-issuable-references' into 'master' Robert Speicher2017-04-131-2/+2
|\ \ \ \ \
| * | | | | Fix appending state to issuable referencesfix-appending-state-to-issuable-referencesAdam Niedzielski2017-04-131-2/+2
* | | | | | Merge branch 'fix-trace-seeking-readline' into 'master' Kamil Trzciński2017-04-131-4/+3
|\ \ \ \ \ \
| * | | | | | Don't seek at all if the log is small anywayLin Jen-Shin2017-04-131-5/+3
| * | | | | | After Trace#limit, we seek to the next line in caseLin Jen-Shin2017-04-131-0/+1
| |/ / / / /
* | | | | | Sanitize container repository path in model classfix/gb/fix-registry-for-uppercased-project-pathsGrzegorz Bizon2017-04-131-2/+2
* | | | | | Fix registry for projects with uppercases in pathGrzegorz Bizon2017-04-131-1/+1
|/ / / / /