Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'usage-ping-port' into 'master' | Sean McGivern | 2017-04-19 | 2 | -0/+99 |
|\ | | | | | | | | | | | | | Usage ping port Closes #27750 See merge request !10481 | ||||
| * | Remove unused user activities code | Sean McGivern | 2017-04-14 | 1 | -65/+0 |
| | | |||||
| * | Add a new Gitlab::UserActivities class to track user activities | Rémy Coutable | 2017-04-14 | 3 | -83/+34 |
| | | | | | | | | | | | | This new class uses a Redis Hash instead of a Sorted Set. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Port 'Add user activities API' to CE | Sean McGivern | 2017-04-14 | 3 | -0/+148 |
| | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/962 | ||||
| * | Add prometheus services to usage ping | Sean McGivern | 2017-04-14 | 1 | -0/+1 |
| | | |||||
| * | Add edition to usage ping | Sean McGivern | 2017-04-14 | 1 | -5/+8 |
| | | |||||
| * | Add Upload count to usage data | Robert Speicher | 2017-04-14 | 1 | -0/+1 |
| | | |||||
| * | Used named parameter for refreshing usage data | Stan Hu | 2017-04-14 | 1 | -4/+4 |
| | | |||||
| * | Cache the last usage data to avoid unicorn timeouts | Stan Hu | 2017-04-14 | 1 | -4/+4 |
| | | |||||
| * | Port 'Add uuid to usage ping' to CE | Sean McGivern | 2017-04-14 | 1 | -1/+4 |
| | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1521 | ||||
| * | Track Mattermost usage | Z.J. van de Weg | 2017-04-14 | 1 | -1/+2 |
| | | |||||
| * | Remove pushes count from usage ping payload | Ruben Davila | 2017-04-14 | 1 | -1/+0 |
| | | | | | | | | | | | | This query is constantly generating timeout errors on large installations and we don't have a simple solution for now and also we don't think having this counter is really critical. | ||||
| * | Port 'Add more usage data to EE ping' to CE | Sean McGivern | 2017-04-14 | 1 | -0/+57 |
| | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/735 | ||||
* | | Merge branch 'fix/improve-gitaly-unsupported-address-error' into 'master' | Robert Speicher | 2017-04-18 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Improve gitaly_address error message Closes gitaly#174 See merge request !10532 | ||||
| * | | Improve gitaly_address error messagefix/improve-gitaly-unsupported-address-error | Ahmad Sherif | 2017-04-08 | 1 | -1/+1 |
| | | | | | | | | | | | | Closes gitaly#174 | ||||
* | | | Improves support for long build traces: | Filipa Lacerda | 2017-04-18 | 1 | -1/+1 |
| | | | |||||
* | | | Use &. because rubocop. Seriously I don't think this makes sense | Lin Jen-Shin | 2017-04-18 | 1 | -1/+1 |
| | | | |||||
* | | | Just enforce the output encoding for Ansi2html | Lin Jen-Shin | 2017-04-18 | 1 | -10/+3 |
| | | | | | | | | | | | | Fixes https://sentry.gitlap.com/gitlab/gitlabcom/issues/27545/ | ||||
* | | | Normalize sizes in Gitlab::Git::Blob | Douwe Maan | 2017-04-17 | 1 | -2/+2 |
| | | | |||||
* | | | Set the encoding in c'tor and explain why it's finefix-trace-encoding | Lin Jen-Shin | 2017-04-17 | 1 | -8/+8 |
| | | | |||||
* | | | Only set the encoding before passing to Ansi2html | Lin Jen-Shin | 2017-04-17 | 2 | -5/+8 |
| | | | |||||
* | | | Don't try to read if there's no trace | Lin Jen-Shin | 2017-04-17 | 1 | -0/+2 |
| | | | |||||
* | | | Make sure @stream.each_line would tag Encoding.default_external | Lin Jen-Shin | 2017-04-17 | 1 | -0/+2 |
| | | | |||||
* | | | Make sure we're giving Encoding.default_external | Lin Jen-Shin | 2017-04-17 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Merge branch '30349-create-users-build-service' into 'master' | Rémy Coutable | 2017-04-14 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Implement Users::BuildService Closes #30349 See merge request !10675 | ||||
| * | | Implement Users::BuildService | geoandri | 2017-04-13 | 1 | -1/+1 |
| | | | |||||
* | | | Don't seek at all if the log is small anyway | Lin Jen-Shin | 2017-04-13 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | then it's fine to skip the first line because it won't be very noticeable | ||||
* | | | After Trace#limit, we seek to the next line in case | Lin Jen-Shin | 2017-04-13 | 1 | -0/+1 |
|/ / | | | | | | | of breaking ANSI sequence or Unicode | ||||
* | | Merge branch 'zero-downtime-migrations' into 'master' | Douwe Maan | 2017-04-12 | 2 | -1/+293 |
|\ \ | | | | | | | | | | | | | Prepare for zero downtime migrations See merge request !9976 | ||||
| * | | Prepare for zero downtime migrationszero-downtime-migrations | Yorick Peterse | 2017-04-12 | 2 | -1/+293 |
| | | | | | | | | | | | | | | | | | | | | | Starting with GitLab 9.1.0 we will no longer allow downtime migrations unless absolutely necessary. This commit updates the various developer guides and adds code that is necessary to make zero downtime migrations less painful. | ||||
* | | | Merge branch '29056-backport-ee-cleanup-database-file' into 'master' | Douwe Maan | 2017-04-12 | 2 | -4/+12 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | removes redundant code from database.rb Closes #29056 See merge request !10583 | ||||
| * | | | removes redundant code from database.rb29056-backport-ee-cleanup-database-file | Tiago Botelho | 2017-04-11 | 2 | -4/+12 |
| | | | | |||||
* | | | | Merge branch 'zj-fix-coverage-bug' into 'master' | Kamil Trzciński | 2017-04-12 | 1 | -1/+4 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Return nil as coverage instead of a File object See merge request !10633 | ||||
| * | | | Return nil as coverage instead of a File objectzj-fix-coverage-bug | Z.J. van de Weg | 2017-04-12 | 1 | -1/+4 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Given a valid pipeline job, and a regex which wouldn't match to a jobs trace, the stream of the trace would return the File object. This was not the case when it matched a value, as that would have been return from the block. Now the `extract_coverage` method returns `nil` if no match was found. | ||||
* | | | Merge branch 'gitaly-testing' into 'master' | Rémy Coutable | 2017-04-12 | 1 | -32/+40 |
|\ \ \ | | | | | | | | | | | | | | | | | Setup and run a Gitaly server for testing if GitalyClient is enabled See merge request !10298 | ||||
| * | | | Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testing | Alejandro Rodríguez | 2017-04-11 | 1 | -32/+40 |
| | | | | |||||
* | | | | Merge branch 'bb_save_trace' into 'master' | Sean McGivern | 2017-04-12 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | [BB Importer] Save the error trace and the whole raw document See merge request !9604 | ||||
| * | | | | [BB Importer] Save the error trace and the whole raw documentbb_save_trace | Valery Sizov | 2017-04-11 | 1 | -2/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'dm-outdated-diff-link' into 'master' | Sean McGivern | 2017-04-11 | 1 | -0/+6 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Link to outdated diff in older MR version from outdated diff discussion Closes #27865 See merge request !10572 | ||||
| * | | | Cache MR diffs by diff refs | Douwe Maan | 2017-04-08 | 1 | -0/+6 |
| | |/ | |/| | |||||
* | | | Don't pass `env` anymore to GitAccess, ChangeAccess, and ForcePushbackport-ee-1525 | Rémy Coutable | 2017-04-10 | 3 | -7/+4 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | Retrieve Git-specific env in Gitlab::Git::RevList and add a new #new_refs method | Rémy Coutable | 2017-04-10 | 2 | -31/+28 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | Retrieve Git-specific env in Gitlab::Git::Repository#rugged | Rémy Coutable | 2017-04-10 | 1 | -1/+9 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | Add a Gitlab::Git::Env to store Git-specific env thread-safely | Rémy Coutable | 2017-04-10 | 1 | -0/+38 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | Test all enabled routes in ETag caching middleware and fix pipeline routestest-all-etag-routes | Adam Niedzielski | 2017-04-10 | 2 | -34/+41 |
| |/ |/| | | | | | | | | | | | | | | | | | Extract route matching logic to Gitlab::EtagCaching::Router. Fix pipeline routes: 1. "project_pipelines" has to come after "commit_pipelines" and "merge_request_pipelines" because it is more generic 2. "commit_pipelines": "\s" (any whitespace character) => "\S" (any non-whitespace character). | ||||
* | | Remove the User#is_admin? method | blackst0ne | 2017-04-09 | 2 | -2/+2 |
|/ | |||||
* | Merge branch 'master' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 6 | -14/+157 |
|\ | |||||
| * | Merge branch 'bvl-fix-project-ci-status-cache' into 'master' | Kamil Trzciński | 2017-04-07 | 1 | -0/+103 |
| |\ | | | | | | | | | | | | | Fix invalidating Project build status cache to often See merge request !10313 | ||||
| | * | Take the ref of a pipeline into account when caching status | Bob Van Landuyt | 2017-04-07 | 1 | -9/+18 |
| | | | |||||
| | * | Rename `ProjectBuildStatus` -> `ProjectPipelineStatus` | Bob Van Landuyt | 2017-04-07 | 1 | -1/+1 |
| | | |