summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-fix-position-tracer-for-hidden-lines' into 'master' Sean McGivern2017-04-241-1/+8
|\
| * Fix commenting on an existing discussion on an unchanged line that is no long...Douwe Maan2017-04-241-1/+8
* | Merge branch '30305-oauth-token-push-code' into 'master' Rémy Coutable2017-04-241-1/+1
|\ \
| * | Allow OAuth clients to push code30305-oauth-token-push-codeTimothy Andrew2017-04-131-1/+1
* | | Merge branch 'email-handler-metrics' into 'master' Sean McGivern2017-04-245-5/+17
|\ \ \
| * | | Make handler metric params more explicitemail-handler-metricsSean McGivern2017-04-215-5/+17
* | | | Merge branch 'workhorse-secret-path' into 'master' Rémy Coutable2017-04-241-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make location of gitlab_workhorse_secret configurableJakub Jirutka2017-04-191-1/+1
* | | | Fix Gitlab::Metrics metaprogramming magicNick Thomas2017-04-211-5/+5
| |/ / |/| |
* | | 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 '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
| |/ /
* | | Use constants in Gitlab::MarkupHelperDouwe Maan2017-04-201-9/+16
* | | Refactor changing files in web UIDouwe Maan2017-04-202-31/+34
|/ /
* | Merge branch 'usage-ping-port' into 'master' Sean McGivern2017-04-192-0/+99
|\ \
| * | Remove unused user activities codeSean McGivern2017-04-141-65/+0
| * | 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-143-0/+148
| * | 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
* | | 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-181-10/+3
* | | | Normalize sizes in Gitlab::Git::BlobDouwe Maan2017-04-171-2/+2
* | | | 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
| |/ / |/| |
* | | Merge branch '30349-create-users-build-service' into 'master' Rémy Coutable2017-04-141-1/+1
|\ \ \
| * | | Implement Users::BuildServicegeoandri2017-04-131-1/+1
| | |/ | |/|
* | | 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
|/ /
* | Merge branch 'zero-downtime-migrations' into 'master' Douwe Maan2017-04-122-1/+293
|\ \
| * | Prepare for zero downtime migrationszero-downtime-migrationsYorick Peterse2017-04-122-1/+293
* | | Merge branch '29056-backport-ee-cleanup-database-file' into 'master' Douwe Maan2017-04-122-4/+12
|\ \ \
| * | | removes redundant code from database.rb29056-backport-ee-cleanup-database-fileTiago Botelho2017-04-112-4/+12
* | | | Merge branch 'zj-fix-coverage-bug' into 'master' Kamil Trzciński2017-04-121-1/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Return nil as coverage instead of a File objectzj-fix-coverage-bugZ.J. van de Weg2017-04-121-1/+4
| |/ /
View Lorry Controller Status