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 | -0/+41 |
| | | | | | | | 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. | ||||
* | Merge branch '30672-versioned-markdown-cache' into 'master' | Douwe Maan | 2017-04-21 | 2 | -55/+18 |
|\ | | | | | | | | | | | | | Start versioning cached markdown fields Closes #30672 See merge request !10597 | ||||
| * | Start versioning cached markdown fields | Nick Thomas | 2017-04-21 | 2 | -55/+18 |
| | | |||||
* | | Merge branch 'sh-fix-issue-31215-2' into 'master' | Douwe Maan | 2017-04-21 | 1 | -0/+25 |
|\ \ | |/ |/| | | | | | | | | | Based on !10841 Fix Error 500 when referencing issue with project in pending delete Closes #31215 See merge request !10843 | ||||
| * | Also test against external-issue for deleted projects | Lin Jen-Shin | 2017-04-21 | 1 | -5/+17 |
| | | | | | | | | | | | | This is based on: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10841 | ||||
| * | Merge remote-tracking branch 'upstream/master' into sh-fix-issue-31215 | Lin Jen-Shin | 2017-04-21 | 8 | -67/+320 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (109 commits) Update CI templates to include 9.1 templates Change spec folder to match the assets one Update style_guide_js.md Milestones documentation refactor Adds documentation entry: Don't user forEach, aim for code without side effects Move kube namespace section to the variables one Changed milestone.to_reference calls into milestone.title for the show, edit and top views Update move icon to match others Issue Title Show Focus Check On Load Update Kubernetes namespace documentation Store projects in metrics for email replies Refactor into .vue files Adds vue js example application and documentation Add ES lint support to identify poorly written Promises Update plantuml.md to add the actual link. Fixed wording Add metrics events for incoming emails Remove helpers assigned_issuables_count and cached_assigned_issuables_count Refactor into .vue files part 2 Fix headings ... | ||||
| * | | Fix Error 500 when referencing issue with project in pending deletesh-fix-issue-31215 | Stan Hu | 2017-04-20 | 1 | -0/+13 |
| | | | | | | | | | | | | Closes #31215 | ||||
* | | | Return empty string on UTF8 conversion with U_STRING_NOT_TERMINATED_WARNING ↵fix/encoding-issue | James Lopez | 2017-04-20 | 1 | -0/+4 |
| |/ |/| | | | | | error | ||||
* | | Merge branch 'issuable-state-custom-links' into 'master' | Sean McGivern | 2017-04-20 | 1 | -32/+76 |
|\ \ | | | | | | | | | | | | | | | | | | | 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 | -32/+76 |
| | | | | | | | | | | | | | | | 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. | ||||
* | | | | Refactor changing files in web UI | Douwe Maan | 2017-04-20 | 4 | -17/+19 |
| |/ / |/| | | |||||
* | | | Merge branch 'issuable-state-only-notes-and-description' into 'master' | Sean McGivern | 2017-04-19 | 1 | -11/+21 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | 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 | -11/+21 |
| | | | | | | | | | | | | Closes #30964 | ||||
* | | | Merge branch 'usage-ping-port' into 'master' | Sean McGivern | 2017-04-19 | 2 | -0/+197 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Usage ping port Closes #27750 See merge request !10481 | ||||
| * | | Remove unused user activities code | Sean McGivern | 2017-04-14 | 1 | -155/+0 |
| | | | |||||
| * | | Add a new Gitlab::UserActivities class to track user activities | Rémy Coutable | 2017-04-14 | 3 | -91/+127 |
| | | | | | | | | | | | | | | | | | | 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/+246 |
| | | | | | | | | | | | | 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 | -0/+1 |
| | | | |||||
| * | | Add Upload count to usage data | Robert Speicher | 2017-04-14 | 1 | -0/+1 |
| | | | |||||
| * | | Port 'Add uuid to usage ping' to CE | Sean McGivern | 2017-04-14 | 1 | -1/+3 |
| | | | | | | | | | | | | 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 | -0/+1 |
| | | | |||||
| * | | 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/+65 |
| | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/735 | ||||
* | | | Improve container registry repository path specsfix/gb/container-registry-repository-paths | Grzegorz Bizon | 2017-04-19 | 1 | -15/+4 |
| | | | |||||
* | | | Fix duplicated container repository names | Grzegorz Bizon | 2017-04-18 | 1 | -1/+30 |
| |/ |/| | |||||
* | | Just enforce the output encoding for Ansi2html | Lin Jen-Shin | 2017-04-18 | 1 | -1/+20 |
| | | | | | | | | Fixes https://sentry.gitlap.com/gitlab/gitlabcom/issues/27545/ | ||||
* | | Fix specsdm-git-blob-sizes | 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 | -1/+1 |
| | | |||||
* | | Restore nil for stream | Lin Jen-Shin | 2017-04-17 | 1 | -1/+1 |
| | | |||||
* | | Only set the encoding before passing to Ansi2html | Lin Jen-Shin | 2017-04-17 | 1 | -7/+7 |
| | | |||||
* | | Make sure @stream.each_line would tag Encoding.default_external | Lin Jen-Shin | 2017-04-17 | 1 | -4/+14 |
| | | |||||
* | | Make sure we're giving Encoding.default_external | Lin Jen-Shin | 2017-04-17 | 1 | -3/+9 |
| | | |||||
* | | Fix regression in rendering Markdown references that do not existsh-fix-base-parser | Stan Hu | 2017-04-15 | 1 | -2/+21 |
|/ | | | | Closes #30972 | ||||
* | Merge branch 'fix-appending-state-to-issuable-references' into 'master' | Robert Speicher | 2017-04-13 | 1 | -11/+32 |
|\ | | | | | | | | | | | | | Fix appending state to issuable references Closes #30874 See merge request !10683 | ||||
| * | Fix appending state to issuable referencesfix-appending-state-to-issuable-references | Adam Niedzielski | 2017-04-13 | 1 | -11/+32 |
| | | | | | | | | | | | | | | Closes #30874. Ignore nodes with no children. Append directly to the node instead of the last child of the node to avoid inheriting formatting from the last child | ||||
* | | Merge branch 'fix-trace-seeking-readline' into 'master' | Kamil Trzciński | 2017-04-13 | 1 | -4/+24 |
|\ \ | | | | | | | | | | | | | | | | | | | After Trace#limit, we seek to the next line in case Closes #30796 See merge request !10681 | ||||
| * | | Update tests for the fact that we would skip one linefix-trace-seeking-readline | Lin Jen-Shin | 2017-04-13 | 1 | -3/+3 |
| | | | |||||
| * | | After Trace#limit, we seek to the next line in case | Lin Jen-Shin | 2017-04-13 | 1 | -1/+21 |
| |/ | | | | | | | of breaking ANSI sequence or Unicode | ||||
* | | Fix registry for projects with uppercases in path | Grzegorz Bizon | 2017-04-13 | 1 | -3/+19 |
|/ | |||||
* | Revert "Fix registry for projects with uppercases in path" | Grzegorz Bizon | 2017-04-13 | 1 | -19/+3 |
| | | | | This reverts commit 22726942fe0b6c11c20de070cc9784de12ca2ce6. | ||||
* | Fix registry for projects with uppercases in path | Grzegorz Bizon | 2017-04-13 | 1 | -3/+19 |
| | |||||
* | Merge branch 'zero-downtime-migrations' into 'master' | Douwe Maan | 2017-04-12 | 2 | -0/+429 |
|\ | | | | | | | | | Prepare for zero downtime migrations See merge request !9976 | ||||
| * | Prepare for zero downtime migrationszero-downtime-migrations | Yorick Peterse | 2017-04-12 | 2 | -0/+429 |
| | | | | | | | | | | | | | | 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/+48 |
|\ \ | | | | | | | | | | | | | | | | | | | 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/+48 |
| | | | |||||
* | | | Merge branch 'zj-fix-coverage-bug' into 'master' | Kamil Trzciński | 2017-04-12 | 2 | -7/+19 |
|\ \ \ | |_|/ |/| | | | | | | | | 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 | 2 | -7/+19 |
| |/ | | | | | | | | | | | | | | | | | 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. |