summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ /
* | | Merge branch 'gitaly-testing' into 'master' Rémy Coutable2017-04-121-32/+40
|\ \ \
| * | | Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testingAlejandro Rodríguez2017-04-111-32/+40
* | | | Merge branch 'bb_save_trace' into 'master' Sean McGivern2017-04-121-2/+2
|\ \ \ \
| * | | | [BB Importer] Save the error trace and the whole raw documentbb_save_traceValery Sizov2017-04-111-2/+2
| | |/ / | |/| |
* | | | Merge branch 'dm-outdated-diff-link' into 'master' Sean McGivern2017-04-111-0/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Cache MR diffs by diff refsDouwe Maan2017-04-081-0/+6
| | |/ | |/|
* | | Don't pass `env` anymore to GitAccess, ChangeAccess, and ForcePushbackport-ee-1525Rémy Coutable2017-04-103-7/+4
* | | Retrieve Git-specific env in Gitlab::Git::RevList and add a new #new_refs methodRémy Coutable2017-04-102-31/+28
* | | Retrieve Git-specific env in Gitlab::Git::Repository#ruggedRémy Coutable2017-04-101-1/+9
* | | Add a Gitlab::Git::Env to store Git-specific env thread-safelyRémy Coutable2017-04-101-0/+38
* | | Test all enabled routes in ETag caching middleware and fix pipeline routestest-all-etag-routesAdam Niedzielski2017-04-102-34/+41
| |/ |/|
* | Remove the User#is_admin? methodblackst0ne2017-04-092-2/+2
|/
* Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-076-14/+157
|\
| * Merge branch 'bvl-fix-project-ci-status-cache' into 'master' Kamil Trzciński2017-04-071-0/+103
| |\
| | * Take the ref of a pipeline into account when caching statusBob Van Landuyt2017-04-071-9/+18
| | * Rename `ProjectBuildStatus` -> `ProjectPipelineStatus`Bob Van Landuyt2017-04-071-1/+1
View Lorry Controller Status