Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add configurable timeout for git fetch and clone operationsmrchrisw-import-shell-timeout | Chris Wilson | 2017-04-27 | 1 | -2/+2 |
| | | | | | | | GitLab uses the import_project method in GitLab Shell, This method uses a timeout for the operation, hardcoded to 800 seconds. With this MR the timeout is now configurable in the gitlab_shell settings. | ||||
* | Start versioning cached markdown fields | Nick Thomas | 2017-04-21 | 1 | -14/+7 |
| | |||||
* | Remove the ClearDatabaseCacheWorker | Nick Thomas | 2017-04-21 | 1 | -6/+1 |
| | |||||
* | Fix Gitlab::Metrics metaprogramming magic | Nick Thomas | 2017-04-21 | 1 | -5/+5 |
| | | | | | | | | | | On initial startup with no rows in the application_settings table, the metaprogramming call to `if enabled?` attempts to create a row. This triggers the HTML caching path, which attempts to store metrics. At this point, not all the methods in `Gitlab::Metrics` have been defined! Move `current_transaction` to be defined before running the metaprogramming, to avoid a confusing NoMethodError | ||||
* | Remove a use of module_function | Nick Thomas | 2017-04-21 | 1 | -12/+10 |
| | |||||
* | Merge branch 'fix/encoding-issue' into 'master' | Sean McGivern | 2017-04-21 | 1 | -1/+7 |
|\ | | | | | | | | | | | | | Fix encoding issue exporting a project Closes #31186 See merge request !10824 | ||||
| * | Return empty string on UTF8 conversion with U_STRING_NOT_TERMINATED_WARNING ↵fix/encoding-issue | James Lopez | 2017-04-20 | 1 | -1/+7 |
| | | | | | | | | error | ||||
* | | Merge branch 'fix-jobs-enabled-parameter' into 'master' | Sean McGivern | 2017-04-21 | 1 | -2/+5 |
|\ \ | | | | | | | | | | | | | | | | | | | Replace builds_enabled with jobs_enabled in projects API v4 Closes #31012 See merge request !10786 | ||||
| * | | Replace builds_enabled with jobs_enabled in projects API v4 (!10786) | winniehell | 2017-04-20 | 1 | -2/+5 |
| | | | |||||
* | | | Merge branch 'add-email-receiver-metrics' into 'master' | Douwe Maan | 2017-04-20 | 3 | -4/+8 |
|\ \ \ | |_|/ |/| | | | | | | | | Add email receiver metrics See merge request !10814 | ||||
| * | | Store projects in metrics for email replies | Sean McGivern | 2017-04-20 | 2 | -4/+4 |
| | | | |||||
| * | | Add metrics events for incoming emails | Sean McGivern | 2017-04-20 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | This lets us track how many incoming emails a GitLab instance is processing, by email type (handler) and by project (where applicable). | ||||
* | | | Merge branch 'issuable-state-custom-links' into 'master' | Sean McGivern | 2017-04-20 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Do not append issuable state to links with custom anchor Closes #30916 See merge request !10782 | ||||
| * | | | Do not append issuable state to links with custom anchorissuable-state-custom-links | Adam Niedzielski | 2017-04-19 | 1 | -2/+2 |
| |/ / | | | | | | | | | | | | | Closes #30916 Change the presentation from [closed] to (closed) | ||||
* | | | Merge branch 'plantuml-filter-after-highlight' into 'master' | Sean McGivern | 2017-04-20 | 1 | -4/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix PlantUML integration in GFM Closes #30557 See merge request !10651 | ||||
| * | | | Fix PlantUML integration in GFMplantuml-filter-after-highlight | Adam Niedzielski | 2017-04-19 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | Fixes #30557 Use "lang" attribute instead of "class" in PlantumlFilter. | ||||
* | | | | Use constants in Gitlab::MarkupHelper | Douwe Maan | 2017-04-20 | 1 | -9/+16 |
| | | | | |||||
* | | | | Refactor changing files in web UI | Douwe Maan | 2017-04-20 | 6 | -39/+42 |
| | | | | |||||
* | | | | Merge branch 'query-users-by-extern-uid' into 'master' | Robert Speicher | 2017-04-19 | 1 | -8/+14 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Implement search by extern_uid in Users API See merge request !10509 | ||||
| * | | | Implement search by extern_uid in Users API | Robin Bobbitt | 2017-04-18 | 1 | -8/+14 |
| | | | | |||||
* | | | | Merge branch 'issuable-state-only-notes-and-description' into 'master' | Sean McGivern | 2017-04-19 | 1 | -0/+2 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Display issuable state only in notes and issuable description Closes #30964 See merge request !10789 | ||||
| * | | | Display issuable state only in notes and issuable description | Adam Niedzielski | 2017-04-19 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | Closes #30964 | ||||
* | | | | Merge branch 'usage-ping-port' into 'master' | Sean McGivern | 2017-04-19 | 7 | -1/+130 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | Usage ping port Closes #27750 See merge request !10481 | ||||
| * | | | Remove unused user activities code | Sean McGivern | 2017-04-14 | 4 | -78/+1 |
| | | | | |||||
| * | | | Expose `last_activity_on` in the User API | Rémy Coutable | 2017-04-14 | 2 | -9/+9 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | 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 | 6 | -1/+172 |
| | | | | | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/962 | ||||
| * | | | Remove user activities table and use redis instead of PG for recording ↵ | James Lopez | 2017-04-14 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | activities Refactored specs and added a post deployment migration to remove the activity users table. | ||||
| * | | | Add user activity service and spec. Also added relevant - NOT offline - ↵ | James Lopez | 2017-04-14 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | migration It uses a user activity table instead of a column in users. Tested with mySQL and postgreSQL | ||||
| * | | | 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 | ||||
* | | | | Fix duplicated container repository names | Grzegorz Bizon | 2017-04-18 | 1 | -2/+8 |
| |/ / |/| | | |||||
* | | | 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 | 2 | -11/+4 |
| | | | | | | | | | | | | | | | | Fixes https://sentry.gitlap.com/gitlab/gitlabcom/issues/27545/ | ||||
* | | | | Merge branch 'dm-git-blob-sizes' into 'master' | Robert Speicher | 2017-04-18 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Normalize sizes in Gitlab::Git::Blob See merge request !10742 | ||||
| * | | | | Normalize sizes in Gitlab::Git::Blob | Douwe Maan | 2017-04-17 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Does not remove the GitHub remote when importing from GitHub | Douglas Barbosa Alexandre | 2017-04-18 | 1 | -1/+0 |
|/ / / / | |||||
* | | | | 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 |
| | | | |