summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Avoid leaving a push event empty if payload cannot be createdsh-validate-path-project-importStan Hu2018-01-031-2/+12
| | | | | | | | If the payload cannot be created for some reason, we could be left with a nil push event payload, which causes Error 500s when viewing the dashboard. Guard against this error and log when it happens. Avoids problems seen in #38823
* Merge branch 'sh-optimize-commit-stats' into 'master'Robert Speicher2018-01-031-0/+5
|\ | | | | | | | | Speed up generation of commit stats by using Rugged native methods See merge request gitlab-org/gitlab-ce!16186
| * Speed up generation of commit stats by using Rugged native methodssh-optimize-commit-statsStan Hu2018-01-021-0/+5
| | | | | | | | | | | | | | | | | | | | The previous implementation iterated across the entire patch set to determine the number of lines added, deleted, and changed. Rugged has a native method `Rugged::Diff#stat` that does this already, which appears to be a little faster and require less RAM than doing this ourselves. Improves performance in #41524
* | Merge branch 'migrate-fork-repo-to-gitaly' into 'master'Robert Speicher2018-01-031-23/+49
|\ \ | | | | | | | | | | | | | | | | | | Migrate repo forking to Gitaly Closes gitaly#825 See merge request gitlab-org/gitlab-ce!16018
| * | Migrate repo forking to Gitalymigrate-fork-repo-to-gitalyAhmad Sherif2018-01-021-23/+49
| | | | | | | | | | | | Closes gitaly#825
* | | Merge branch '34534-switch-to-axios' into 'master'Filipa Lacerda2018-01-0320-223/+159
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Switch some bundles to use Axios Closes #41043 See merge request gitlab-org/gitlab-ce!15951
| * | | Switch boards to AxiosEric Eastwood2018-01-0210-83/+70
| | | |
| * | | Switch blob/notebook to AxiosEric Eastwood2018-01-021-31/+17
| | | |
| * | | Switch vue_merge_request_widget to AxiosEric Eastwood2018-01-027-31/+17
| | | |
| * | | Switch issue_show to AxiosEric Eastwood2018-01-022-78/+55
| | | |
* | | | Merge branch '41424-gitlab-rake-gitlab-import-repos-schedules-an-import' ↵Douwe Maan2018-01-031-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "gitlab-rake gitlab:import:repos schedules an import" Closes #41424 See merge request gitlab-org/gitlab-ce!16115
| * | | | refactor code to use new import typeJames Lopez2018-01-031-1/+1
| | | | |
| * | | | fix wiki checkJames Lopez2018-01-021-0/+1
| | | | |
| * | | | add extra spec checkJames Lopez2018-01-021-1/+2
| | | | |
| * | | | Fix import scheduled on bare repo importJames Lopez2018-01-021-0/+8
| | |_|/ | |/| |
* | | | Multi File Editor File iconsTim Zallmann2018-01-032-15/+83
| | | |
* | | | Merge branch 'jprovazn-search-issues' into 'master'Sean McGivern2018-01-031-7/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Skip projects filter on issues search See merge request gitlab-org/gitlab-ce!16117
| * | | | Skip projects filter on issues searchjprovazn-search-issuesJan Provaznik2018-01-021-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When searching for issues, an additional subquery is added which filters only issues in a project. If global context is used (no project is specified) this query filters all projects user has access to. In that case we can skip this filter because filtering only projects user has access to is added anyway. The filter is used only if a custom project context is specified Related to #40540
* | | | | Merge branch 'gitaly-conflict-resolver' into 'master'Grzegorz Bizon2018-01-033-17/+119
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly conflict resolver Closes gitaly#813 See merge request gitlab-org/gitlab-ce!15755
| * | | | | Simplify conflict resolution interface and codegitaly-conflict-resolverAlejandro Rodríguez2018-01-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a Gitlab::Git::Conflict::Resolution class to encapsulate resolution data - Simplify conflict file collection assembly
| * | | | | Incorporate ConflictsService.ResolveConflicts Gitaly RPCAlejandro Rodríguez2017-12-271-7/+36
| | | | | |
| * | | | | Incorporate ConflictsService.ListConflictFiles Gitaly RPCAlejandro Rodríguez2017-12-273-17/+87
| | | | | |
* | | | | | Merge branch 'rd-fix-reset-password-while-logged-in' into 'master'Robert Speicher2018-01-021-0/+19
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow logged in user to change his password Closes gitlab-ee#3482 See merge request gitlab-org/gitlab-ce!16169
| * | | | | Allow logged in user to change his passwordrd-fix-reset-password-while-logged-inRubén Dávila2017-12-311-0/+19
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Users were unable to change their password through the "Reset password" link that was sent to their email if they were logged in. This is due to a default controller filter from Devise that requires the user to not be logged in in order to use this link.
* | | | | Merge branch 'fj-40053-error-500-members-list' into 'master'Douwe Maan2018-01-023-1/+98
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix user membership destroy relation Closes #40053 See merge request gitlab-org/gitlab-ce!15970
| * | | | | Fix user membership destroy relationFrancisco Javier López2018-01-023-1/+98
| | | | | |
* | | | | | Merge branch 'bvl-fork-public-project-to-private-namespace' into 'master'Douwe Maan2018-01-022-2/+42
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forking a project to a namespace with lower visibility Closes #40022 See merge request gitlab-org/gitlab-ce!16050
| * | | | | Forking a project to a namespace with lower visibility.bvl-fork-public-project-to-private-namespaceBob Van Landuyt2017-12-292-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this case the project will get the minimum between both visibilities. If that visibility is restricted, then a lower level will be picked.
* | | | | | Clears visual token on second backspaceMartin Wortschack2018-01-022-0/+19
| | | | | |
* | | | | | Add breadcrumbs to User Settings sub-viewsRob Watson2018-01-012-0/+9
| |/ / / / |/| | | | | | | | | | | | | | Closes #40274
* | | | | Merge branch '41492-mr-comment-fix' into 'master'Sean McGivern2017-12-292-14/+66
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix links to old commits in merge request comments Closes #41492 See merge request gitlab-org/gitlab-ce!16152
| * | | | | Fix links to old commits in merge requests41492-mr-comment-fixJarka Kadlecová2017-12-292-14/+66
| |/ / / /
* | | | | Merge branch '20035-pause-resume-runners' into 'master'Grzegorz Bizon2017-12-291-0/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pause/resume button to project runners Closes #20035 See merge request gitlab-org/gitlab-ce!16032
| * | | | | Add pause/resume button to specific project runnersMario de la Ossa2017-12-271-0/+20
| | |_|_|/ | |/| | |
* | | | | Merge branch 'gitaly-encoding-helpers' into 'master'Grzegorz Bizon2017-12-292-14/+14
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Move encoding methods to the more general EncodingHelper Closes gitaly#847 See merge request gitlab-org/gitlab-ce!16137
| * | | | Move encoding methods to the more general EncodingHelpergitaly-encoding-helpersAlejandro Rodríguez2017-12-282-14/+14
| | | | |
* | | | | Merge branch '24347-dont-post-system-note-when-branch-creation-fails' into ↵Stan Hu2017-12-271-0/+14
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix when branch creation fails don't post system note Closes #24347 See merge request gitlab-org/gitlab-ce!16142
| * | | | Fix when branch creation fails don't post system noteMateusz Bajorski2017-12-261-0/+14
| | | | | | | | | | | | | | | | | | | | Closes #24347
* | | | | Merge branch 'sh-make-kib-human' into 'master'Filipa Lacerda2017-12-271-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Humanize the units of "Showing last X KiB of log" in job trace Closes #38613 See merge request gitlab-org/gitlab-ce!16147
| * | | | | Humanize the units of "Showing last X KiB of log" in job tracesh-make-kib-humanStan Hu2017-12-271-4/+4
| | |_|/ / | |/| | | | | | | | | | | | | Closes #38613
* | | | | Fix PostgreSQL implementation of migrationsh-fix-mysql-migration-10-3Stan Hu2017-12-271-1/+1
| | | | |
* | | | | Fix migration for removing orphaned issues.moved_to_id values in MySQLStan Hu2017-12-261-0/+25
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to https://dev.mysql.com/doc/refman/5.7/en/update.html, "You cannot update a table and select from the same table in a subquery." Attempting to do so results in the error: ``` Mysql2::Error: Table 'issues' is specified twice, both as a target for 'UPDATE' and as a separate source for data ``` Instead, we can use a LEFT JOIN on the same table to make MySQL do the right thing. Closes #41498
* | | | Merge branch 'sh-handle-anonymous-clones-project-moved' into 'master'Grzegorz Bizon2017-12-261-0/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix Error 500s with anonymous clones for a project that has moved Closes #41457 See merge request gitlab-org/gitlab-ce!16128
| * | | Disable redirect messages for anonymous clonessh-handle-anonymous-clones-project-movedStan Hu2017-12-251-2/+1
| | | |
| * | | Fix Error 500s with anonymous clones for a project that has movedStan Hu2017-12-251-0/+7
| | | | | | | | | | | | | | | | Closes #41457
* | | | Merge branch 'sh-catch-invalid-uri-markdown' into 'master'Robert Speicher2017-12-251-0/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Gracefully handle garbled URIs in Markdown Closes #41442 See merge request gitlab-org/gitlab-ce!16123
| * | | Gracefully handle garbled URIs in Markdownsh-catch-invalid-uri-markdownStan Hu2017-12-221-0/+5
| |/ / | | | | | | | | | | | | | | | | | | There are certain inputs that look like valid URIs that are accepted by URI but not Addressable::URI. Handle the case where the latter fails. Closes #41442
* | | Merge branch 'gitaly-remotes' into 'master'Dmitriy Zaporozhets2017-12-252-15/+90
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's RemoteService RPCs Closes gitaly#852 See merge request gitlab-org/gitlab-ce!16060
| * | | Incorporate Gitaly's RemoteService RPCsgitaly-remotesAlejandro Rodríguez2017-12-222-0/+90
| | | |
| * | | Remove unused method `remote_exists?`Alejandro Rodríguez2017-12-221-15/+0
| | | |
View Lorry Controller Status