summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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-182-11/+4
| | | | Fixes https://sentry.gitlap.com/gitlab/gitlabcom/issues/27545/
* Merge branch 'dm-git-blob-sizes' into 'master' Robert Speicher2017-04-181-2/+2
|\ | | | | | | | | Normalize sizes in Gitlab::Git::Blob See merge request !10742
| * Normalize sizes in Gitlab::Git::BlobDouwe Maan2017-04-171-2/+2
| |
* | Does not remove the GitHub remote when importing from GitHubDouglas Barbosa Alexandre2017-04-181-1/+0
|/
* 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
|
* Fix regression in rendering Markdown references that do not existsh-fix-base-parserStan Hu2017-04-151-1/+2
| | | | Closes #30972
* Merge branch '30349-create-users-build-service' into 'master' Rémy Coutable2017-04-141-1/+1
|\ | | | | | | | | | | | | Implement Users::BuildService Closes #30349 See merge request !10675
| * Implement Users::BuildServicegeoandri2017-04-131-1/+1
| |
* | Merge branch 'branch-versions' into 'master' Rémy Coutable2017-04-144-34/+22
|\ \ | | | | | | | | | | | | | | | | | | Expand components version specification format to allow branches Closes gitaly#183 See merge request !10610
| * | Expand components version specification format to allow branchesbranch-versionsAlejandro Rodríguez2017-04-134-34/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we specify versions for Gitlab-Shell, Workhorse and Gitaly using version strings, to which we prepend 'v' and assume are tags. These changes allow branches or tags with other name formats to be specified by prepending '=' to the version string (á la govendor). We also simplify the process to reset to the given version (now a branch or tag): Right now there's a check to supposedly try to avoid fetching from the remote the version if it already exist locally. But the previous logic already clones if the directory doesn't exist or fetches if it does, so this check is pointless. We can safely assume the version exists once we get to the reset stage.
* | | Merge branch 'fix-appending-state-to-issuable-references' into 'master' Robert Speicher2017-04-131-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix appending state to issuable references Closes #30874 See merge request !10683
| * | | Fix appending state to issuable referencesfix-appending-state-to-issuable-referencesAdam Niedzielski2017-04-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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ński2017-04-131-4/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After Trace#limit, we seek to the next line in case Closes #30796 See merge request !10681
| * | | | Don't seek at all if the log is small anywayLin Jen-Shin2017-04-131-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 caseLin Jen-Shin2017-04-131-0/+1
| |/ / / | | | | | | | | | | | | of breaking ANSI sequence or Unicode
* | | | Sanitize container repository path in model classfix/gb/fix-registry-for-uppercased-project-pathsGrzegorz Bizon2017-04-131-2/+2
| | | |
* | | | Fix registry for projects with uppercases in pathGrzegorz Bizon2017-04-131-1/+1
|/ / /
* | | Revert "Fix registry for projects with uppercases in path"Grzegorz Bizon2017-04-131-1/+1
| | | | | | | | | | | | This reverts commit 22726942fe0b6c11c20de070cc9784de12ca2ce6.
* | | Fix registry for projects with uppercases in pathGrzegorz Bizon2017-04-131-1/+1
| |/ |/|
* | Merge branch ↵Sean McGivern2017-04-121-7/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 'omnibus-gitlab-1993-check-shell-repositories-path-group-is-root' into 'master' Fix the `gitlab:gitlab_shell:check` task Closes omnibus-gitlab#1993 See merge request !10645
| * | Fix the `gitlab:gitlab_shell:check` taskomnibus-gitlab-1993-check-shell-repositories-path-group-is-rootRémy Coutable2017-04-121-7/+7
| |/ | | | | | | | | | | | | Make the `gitlab:gitlab_shell:check` task check that the repositories storage path are owned by the `root` group Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'zero-downtime-migrations' into 'master' Douwe Maan2017-04-122-1/+293
|\ \ | |/ |/| | | | | Prepare for zero downtime migrations See merge request !9976
| * Prepare for zero downtime migrationszero-downtime-migrationsYorick Peterse2017-04-122-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 'contributing-ci-templates' into 'master' Rémy Coutable2017-04-121-1/+1
|\ \ | | | | | | | | | | | | Include CONTRIBUTING.md file when importing .gitlab-ci.yml templates See merge request !10653
| * | Include CONTRIBUTING.md file when importing .gitlab-ci.yml templatescontributing-ci-templatesAdam Niedzielski2017-04-121-1/+1
| | |
* | | Merge branch '29056-backport-ee-cleanup-database-file' into 'master' Douwe Maan2017-04-122-4/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | removes redundant code from database.rb Closes #29056 See merge request !10583
| * | | 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 object See merge request !10633
| * | | Return nil as coverage instead of a File objectzj-fix-coverage-bugZ.J. van de Weg2017-04-121-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 'zj-api-fix-build-events' into 'master' Rémy Coutable2017-04-121-3/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Api fix build events rename to Job events Closes #30412 See merge request !10586
| * | | Fix API not accepting job_events for webhookszj-api-fix-build-eventsZ.J. van de Weg2017-04-121-3/+9
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | When renaming, the argument on the projects hook API was forgotten. Now one could successfully set it again. The fix is a little ugly stylewise, but needed as the underlying model still refers to it as build_events. This commit is to fix it, later we should migrate the data to a new column. The edit on the spec file makes sure it passes now, and will fail when we migrate the column.
* | | Merge branch 'gitaly-testing' into 'master' Rémy Coutable2017-04-121-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-testingAlejandro Rodríguez2017-04-111-32/+40
| | |
* | | Merge branch 'bb_save_trace' into 'master' Sean McGivern2017-04-122-6/+4
|\ \ \ | | | | | | | | | | | | | | | | [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_traceValery Sizov2017-04-112-6/+4
| | |/ | |/|
* | | Merge branch 'dm-outdated-diff-link' into 'master' Sean McGivern2017-04-111-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 refsDouwe Maan2017-04-081-0/+6
| | | |
* | | | Merge branch '28017-separate-ce-params-on-api' into 'master' Douwe Maan2017-04-116-30/+111
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Resolve "API: Separate CE params to avoid wrong conflict resolutions" Closes #28017 See merge request !10484
| * | | Add share_with_group_lock to CE optional params block28017-separate-ce-params-on-apiOswaldo Ferreira2017-04-101-0/+1
| | | |
| * | | Separate CE params on Grape APIOswaldo Ferreira2017-04-106-30/+110
| | | |
* | | | Merge branch 'fix/gb/improve-container-registry-clipboard-links' into 'master' Kamil Trzciński2017-04-111-0/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix container repository/tag location text copied into the clipboard Closes #30695 See merge request !10587
| * | | Add method that returns location of registry imageGrzegorz Bizon2017-04-101-0/+4
| |/ /
* | | Merge branch 'backport-ee-1525' into 'master' Robert Speicher2017-04-108-57/+91
|\ \ \ | | | | | | | | | | | | | | | | Backport Git-env code from EE "Fix push rules on Git 2.11" (gitlab-org/gitlab-ee!1525) See merge request !10547
| * | | Don't pass `env` anymore to GitAccess, ChangeAccess, and ForcePushbackport-ee-1525Rémy Coutable2017-04-103-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 methodRémy Coutable2017-04-102-31/+28
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status