summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Support Markdown rendering using multiple projectsrendering-markdown-multiple-projectsYorick Peterse2018-04-1111-48/+123
| | | | | | | | | | | | | | | | | | | This refactors the Markdown pipeline so it supports the rendering of multiple documents that may belong to different projects. An example of where this happens is when displaying the event feed of a group. In this case we retrieve events for all projects in the group. Previously we would group events per project and render these chunks separately, but this would result in many SQL queries being executed. By extending the Markdown pipeline to support this out of the box we can drastically reduce the number of SQL queries. To achieve this we introduce a new object to the pipeline: Banzai::RenderContext. This object simply wraps two other objects: an optional Project instance, and an optional User instance. On its own this wouldn't be very helpful, but a RenderContext can also be used to associate HTML documents with specific Project instances. This work is done in Banzai::ObjectRenderer and allows us to reuse as many queries (and results) as possible.
* Merge branch 'feature/add_target_to_tags' into 'master'Robert Speicher2018-04-091-1/+1
|\ | | | | | | | | Expose the target commit ID through the tag API See merge request gitlab-org/gitlab-ce!18248
| * Expose the target commit ID through the tag APIAndrew Beresford2018-04-081-1/+1
| | | | | | | | | | | | This is useful for annotated tags, where the deferenced target is not the same as the tag object. At the moment there is no way to differentiate the two through the tag API. This change adds a "target" property and leaves the existing "commit" property alone so that existing behaviour is not altered.
* | Make email handler clearerRiccardo Padovani2018-04-091-1/+1
| |
* | Merge branch 'zj-find-license-opt-out' into 'master'Grzegorz Bizon2018-04-091-1/+2
|\ \ | |/ |/| | | | | Move FindLicense RPC to OPT OUT status See merge request gitlab-org/gitlab-ce!18228
| * Move FindLicense RPC to OPT OUT statusZeger-Jan van de Weg2018-04-061-1/+2
| | | | | | | | | | | | | | | | Acceptance testing was successful in https://gitlab.com/gitlab-org/gitaly/issues/1058. So this is moved to OPT OUT. Part of https://gitlab.com/gitlab-org/gitaly/issues/1026
* | Projects and groups badges settings UIFrancisco Javier López2018-04-081-0/+1
| |
* | Use proper auth_scope for deploy tokenKamil Trzciński2018-04-071-1/+1
| |
* | Handle limit for datetime attributes on MySQLMayra Cabrera2018-04-061-0/+13
| | | | | | | | | | | | | | | | | | | | | | The TIMESTAMP data type is used for values that contain both date and time parts. TIMESTAMP has a range of '1970-01-01 00:00:01' UTC to '2038-01-19 03:14:07' UTC. A Forever lib class was included to handle future dates for PostgreSQL and MySQL, also changes were made to DeployToken to enforce Forever.date Also removes extra conditional from JwtController
* | Increase test suite around deploy tokens behaviorMayra Cabrera2018-04-061-5/+3
| | | | | | | | Also, fixes broken specs
* | Fixes broken schema and minor changesMayra Cabrera2018-04-061-2/+2
| |
* | Include ProjectDeployTokensMayra Cabrera2018-04-061-2/+2
| | | | | | | | | | | | Also: - Changes scopes from serializer to use boolean columns - Fixes broken specs
* | Support Deploy Tokens properly without hacking abilitiesKamil Trzciński2018-04-062-13/+13
| |
* | Addreses backend review suggestionsMayra Cabrera2018-04-061-2/+2
| | | | | | | | | | | | - Remove extra method for authorize_admin_project - Ensure project presence - Rename 'read_repo' to 'read_repository' to be more verbose
* | Removes logic from Jwt and handle different scenarios on Gitlab::AuthMayra Cabrera2018-04-061-5/+13
| | | | | | | | | | | | | | - When using 'read_repo' password and project are sent, so we used both of them to fetch for the token - When using 'read_registry' only the password is sent, so we only use that for fetching the token
* | Implement 'read_repo' for DeployTokensMayra Cabrera2018-04-062-2/+25
| | | | | | | | This will allow to download a repo using the token from the DeployToken
* | Merge branch '42568-pipeline-empty-state' into 'master'Kamil Trzciński2018-04-0612-1/+160
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Wrong empty state for cancelled build, hides existing logs!" Closes #42568 See merge request gitlab-org/gitlab-ce!17646
| * \ Merge branch 'master' into '42568-pipeline-empty-state'Kamil Trzciński2018-04-0645-133/+826
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/jobs/show.html.haml # lib/gitlab/ci/status/core.rb
| * | | Put Erased empty state at the beginningMatija Čupić2018-04-051-3/+3
| | | |
| * | | Rename success to erased empty state specMatija Čupić2018-04-052-3/+3
| | | |
| * | | Fix job setup in success empty state specsMatija Čupić2018-04-041-1/+1
| | | |
| * | | Add success CI Build empty state statusMatija Čupić2018-04-042-1/+23
| | | |
| * | | [ci skip] Merge branch 'master' into 42568-pipeline-empty-stateFilipa Lacerda2018-04-0468-303/+762
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (293 commits) Revert changelog entry for removed feature Revert "Allow CI/CD Jobs being grouped on version strings" Resolve "Protected branches count is wrong when a wildcard includes several protected branches" Use standard codequality job Resolve "Allow the configuration of a project's merge method via the API" [Rails5] Rename `sort` methods to `sort_by_attribute` Add better LDAP connection handling Updated components to PascalCase Handle invalid params when trying update_username Move network related app settings to expandable blocks [Rails5] Update Gemfile.rails5.lock [ci skip] Update Security Products examples documentation Backport Gitlab::Git::Checksum to CE Add changelog Refactor discussions/notes code Remove unnecessary section looking in admin settings qa Explicitly use page context for qa/factory/settings/hashed_storage.rb Use gitlab_environment because we need: Allow feature gate removal through the API Use shard name in Git::GitlabProjects instead of shard path ...
| * | | | Add action_button_title Core status methodMatija Čupić2018-04-031-0/+4
| | | | |
| * | | | Move action button titles to respective statusesMatija Čupić2018-03-295-3/+17
| | | | |
| * | | | Merge branch 'master' into 42568-pipeline-empty-stateMatija Čupić2018-03-2880-328/+952
| |\ \ \ \
| * | | | | Move the empty state extended status to be the beginningMatija Čupić2018-03-281-7/+7
| | | | | |
| * | | | | Separate the manual empty state from the action empty stateMatija Čupić2018-03-283-12/+25
| | | | | |
| * | | | | Move action link to build extended status illustrationMatija Čupić2018-03-281-0/+2
| | | | | |
| * | | | | Move illustration to build specific statusesMatija Čupić2018-03-2811-44/+101
| | | | | |
| * | | | | Extend Gitlab::Ci::Status#illustration to include metadataMatija Čupić2018-03-265-5/+28
| | | | | |
| * | | | | Add illustrations to build statusesMatija Čupić2018-03-246-0/+24
| | | | | |
* | | | | | Merge branch 'da-gitaly-calculate-repository-checksum' into 'master'Stan Hu2018-04-063-82/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repository checksum calculation is handled by Gitaly when feature is enabled See merge request gitlab-org/gitlab-ce!18210
| * | | | | | Move checksum calculation to Gitlab::Git::Repositoryda-gitaly-calculate-repository-checksumDouglas Barbosa Alexandre2018-04-062-97/+40
| | | | | | |
| * | | | | | Checksum calculation is handled by Gitaly when feature is enabledDouglas Barbosa Alexandre2018-04-061-4/+19
| | | | | | |
| * | | | | | Add calculate_checksum method to the Gitaly repository clientDouglas Barbosa Alexandre2018-04-061-0/+6
| | | | | | |
* | | | | | | Merge branch '17939-osw-patch-support-gfm' into 'master'Sean McGivern2018-04-061-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for patch link extension for commit links on GFM Closes #17939 See merge request gitlab-org/gitlab-ce!18229
| * | | | | | | Add support for patch link extension for commit links on GFMOswaldo Ferreira2018-04-061-0/+4
| | | | | | | |
* | | | | | | | Merge branch 'fix-500-error-when-mr-ref-is-not-yet-fetched' into 'master'Rémy Coutable2018-04-061-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix 500 error when MR from fork has conflicts but worker has not run See merge request gitlab-org/gitlab-ce!18226
| * | | | | | | Fix 500 error when MR from fork has conflicts but worker has not runfix-500-error-when-mr-ref-is-not-yet-fetchedSean McGivern2018-04-061-1/+1
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the ref hasn't been fetched into the target repository yet, this will fail with a Rugged::ReferencError (assuming we're not using Gitaly). We should handle this in the same way as a missing ref.
* | | | | | | Merge branch 'sh-add-cleanup-rpc-gitaly' into 'master'Sean McGivern2018-04-063-27/+49
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically cleanup stale worktrees and lock files upon a push Closes #44115 See merge request gitlab-org/gitlab-ce!18095
| * | | | | | | Automatically cleanup stale worktrees and lock files upon a pushStan Hu2018-04-063-27/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git 2.16 will fail badly if there are stale worktrees. Closes #44115
* | | | | | | | Extend API for importing a project export with overwrite supportFrancisco Javier López2018-04-064-5/+60
|/ / / / / / /
* | | | | | | Merge branch 'jramsay-38830-tarball' into 'master'Douwe Maan2018-04-065-10/+17
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add alternative archive route Closes #38830 See merge request gitlab-org/gitlab-ce!17225
| * | | | | | Add new repository archive routeJames Ramsay2018-04-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repository archives are always named `<project>-<ref>-<sha>` even if the ref is a commit. A consequence of always including the sha even for tags is that packaging a release is more difficult because both the ref and sha must be known by the packager. - add `<project>/-/archive/<ref>/<filename>.<format>` route using the `-` separator to prevent namespace collisions. If the filename is `<project>-<ref>` or the ref is a sha, the sha will be omitted, otherwise the default filename will be used. - deprecate previous archive route `repository/<ref>/archive`
| * | | | | | Add option to suppress archive commit shaJames Ramsay2018-04-045-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repository archives are always named `<project>-<ref>-<sha>` even if the ref is a commit. A consequence of always including the sha even for tags is that packaging a release is more difficult because both the ref and sha must be known by the packager. - add append_sha option (defaults true) to provide a method for toggling this feature. Support added to GitLab Workhorse by gitlab-org/gitlab-workhorse!232
* | | | | | | Merge branch 'fix/gb/fix-deployment-platform-for-environment' into 'master'Kamil Trzciński2018-04-061-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix environment deployment platform filter method See merge request gitlab-org/gitlab-ce!18216
| * | | | | | | Fix environment deployment platform filter methodGrzegorz Bizon2018-04-061-1/+1
| | | | | | | |
* | | | | | | | [Rails5] Update `type_cast_*_database` methodsblackst0ne2018-04-062-12/+41
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'issue_42443' into 'master'Sean McGivern2018-04-061-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include subgroup issues when searching for group issues using the API Closes #42443 See merge request gitlab-org/gitlab-ce!18068