summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'feature/add_target_to_tags' into 'master'Robert Speicher2018-04-091-0/+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-0/+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.
* | Merge branch ↵Yorick Peterse2018-04-092-8/+89
|\ \ | | | | | | | | | | | | | | | | | | 'fix-n-plus-one-when-getting-notification-settings-for-recipients' into 'master' Use Goldiloader for handling N+1 queries See merge request gitlab-org/gitlab-ce!18217
| * | Add cop for has_many :through without disabled autoloadingfix-n-plus-one-when-getting-notification-settings-for-recipientsSean McGivern2018-04-091-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Goldiloader is great, but has several issues with has_many :through relations: * https://github.com/salsify/goldiloader/issues/12 * https://github.com/salsify/goldiloader/issues/14 * https://github.com/salsify/goldiloader/issues/18 Rather than try to figure out which applies in each case, we should just do the drudge work of manually disabling autoloading for all relations of this type. We can always use regular preloading for specific cases, but this way we avoid generating invalid queries through Goldiloader's magic.
| * | Use Goldiloader for handling N+1 queriesYorick Peterse2018-04-091-8/+15
| | | | | | | | | | | | | | | | | | | | | Goldiloader (https://github.com/salsify/goldiloader) can eager load associations automatically. This removes the need for adding "includes" calls in a variety of different places. This also comes with the added benefit of not having to eager load data if it's not used.
* | | Merge branch 'sh-bump-ruby-and-git-image-ci' into 'master'Rémy Coutable2018-04-091-0/+6
|\ \ \ | | | | | | | | | | | | | | | | Bump Ruby to 2.3.7 and git to 2.17.0 in CI image See merge request gitlab-org/gitlab-ce!18244
| * | | Work around Ruby 2.3.7 bug by defining prepended class methods needed for testsStan Hu2018-04-091-0/+6
| | | |
* | | | Merge branch '44296-commit-path' into 'master'Phil Hughes2018-04-091-0/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Cannot read property 'commit_path' of null" Closes #44296 See merge request gitlab-org/gitlab-ce!18231
| * | | | Checks if commit information exists before trying to render it44296-commit-pathFilipa Lacerda2018-04-061-0/+40
| | | | |
* | | | | Merge branch '41981-allow-group-owner-to-enable-runners-from-subgroups' into ↵Yorick Peterse2018-04-091-0/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Group owner cannot enable/disable specific-runners which was registered in a project under a subgroup" Closes #41981 See merge request gitlab-org/gitlab-ce!18009
| * | | | | Allow group owner to enable runners from subgroups (#41981)Dylan Griffith2018-04-091-0/+15
| | |_|_|/ | |/| | |
* | | | | Merge branch 'move-board-blank-state-vue-component' into 'master'Filipa Lacerda2018-04-091-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Move BoardBlankState vue component See merge request gitlab-org/gitlab-ce!17666
| * | | | Move BoardBlankState vue componentGeorge Tsiolis2018-04-071-2/+2
| | | | |
* | | | | Make email handler clearerRiccardo Padovani2018-04-091-0/+24
| | | | |
* | | | | Merge branch 'sh-fix-issue-45152' into 'master'Grzegorz Bizon2018-04-091-2/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix undefined method `one?` when pushing to an existing merge request Closes #45152 See merge request gitlab-org/gitlab-ce!18243
| * | | | | Fix undefined method `one?` when pushing to an existing merge requestsh-fix-issue-45152Stan Hu2018-04-071-2/+14
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An untested code path was triggering an Exception because Fixnum doesn't have `one?` implemented in Rails, while arrays and collections do. Closes #45152
* | | | | Merge branch '44224-remove-gl' into 'master'Phil Hughes2018-04-091-2/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove modal boards code from global namepsace See merge request gitlab-org/gitlab-ce!18222
| * | | | | Remove modal store and mixins from global scope44224-remove-glFilipa Lacerda2018-04-061-2/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch '32617-fix-template-selector-menu-visibility' into 'master'Phil Hughes2018-04-091-0/+66
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Template selectors menu title mistakenly shown after toggling previewed changes" Closes #32617 See merge request gitlab-org/gitlab-ce!18118
| * | | | | Fix template selector menu visibilityFabian Schneider2018-04-081-0/+66
| | |/ / / | |/| | |
* | | | | Merge branch 'sh-handle-legacy-archive-requests' into 'master'Douwe Maan2018-04-091-0/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Handle legacy repository archive requests with no ref given Closes #45154 See merge request gitlab-org/gitlab-ce!18246
| * | | | Handle legacy repository archive requests with no ref givensh-handle-legacy-archive-requestsStan Hu2018-04-081-0/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | The legacy endpoint requires no reference and defaults to the root ref. Closes #45154
* | | | Projects and groups badges settings UIFrancisco Javier López2018-04-0815-3/+1962
|/ / /
* | | Use proper auth_scope for deploy tokenKamil Trzciński2018-04-071-2/+2
| | |
* | | Handle limit for datetime attributes on MySQLMayra Cabrera2018-04-064-15/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Handles default expires_at date directly into DeployToken modelMayra Cabrera2018-04-061-1/+9
| | |
* | | Removes deploy tokens presenterMayra Cabrera2018-04-061-16/+0
| | |
* | | Addresses database commentsMayra Cabrera2018-04-062-1/+1
| | | | | | | | | | | | | | | | | | | | | - Adds a default on expires_at datetime - Modifies deploy tokens views to handle default expires at value - Use datetime_with_timezone where possible - Remove unused scopes
* | | Increase test suite around deploy tokens behaviorMayra Cabrera2018-04-0610-193/+119
| | | | | | | | | | | | Also, fixes broken specs
* | | Fixes broken schema and minor changesMayra Cabrera2018-04-062-1/+2
| | |
* | | Include ProjectDeployTokensMayra Cabrera2018-04-0612-80/+97
| | | | | | | | | | | | | | | | | | Also: - Changes scopes from serializer to use boolean columns - Fixes broken specs
* | | Support Deploy Tokens properly without hacking abilitiesKamil Trzciński2018-04-063-6/+6
| | |
* | | Addreses backend review suggestionsMayra Cabrera2018-04-065-9/+55
| | | | | | | | | | | | | | | | | | - 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-063-55/+102
| | | | | | | | | | | | | | | | | | | | | - 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
* | | Addreses frontend reviewMayra Cabrera2018-04-061-3/+3
| | | | | | | | | | | | Also fixes spec failures on presenter and docs
* | | Implement read_registry for DeployTokensMayra Cabrera2018-04-061-8/+29
| | |
* | | Address UX reviewMayra Cabrera2018-04-064-22/+49
| | | | | | | | | | | | | | | | | | | | | | | | - Keep 'Deploy Section' open upon save, otherwise the token might get lost - When an error appears, display the error inside the form and also keep the Deploy Section open - Changue copy of revoke modal
* | | Implement 'read_repo' for DeployTokensMayra Cabrera2018-04-064-17/+151
| | | | | | | | | | | | This will allow to download a repo using the token from the DeployToken
* | | Create barebones for DeploytokenMayra Cabrera2018-04-067-0/+233
| |/ |/| | | | | | | | | | | | | | | | | Includes: - Model, factories, create service and controller actions - As usual, includes specs for everything - Builds UI (copy from PAT) - Add revoke action Closes #31591
* | Merge branch 'sh-fix-recaptcha-test' into 'master'Stan Hu2018-04-061-3/+0
|\ \ | | | | | | | | | | | | | | | | | | Fix the reCAPTCHA spec failures by not rendering the widget in test mode Closes #45138 See merge request gitlab-org/gitlab-ce!18235
| * | Fix the reCAPTCHA spec failures by not rendering the widget in test modeStan Hu2018-04-061-3/+0
| | | | | | | | | | | | | | | | | | | | | We've seen changes in behavior in the reCAPTCHA widget that led to test failures. To avoid these issues, don't render the widget at all in test mode. Closes #45138
* | | Merge branch '42568-pipeline-empty-state' into 'master'Kamil Trzciński2018-04-0615-35/+331
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Wrong empty state for cancelled build, hides existing logs!" Closes #42568 See merge request gitlab-org/gitlab-ce!17646
| * | | Add missing trace artifacts to jobs in specMatija Čupić2018-04-061-2/+2
| | | |
| * | | Merge branch 'master' into '42568-pipeline-empty-state'Kamil Trzciński2018-04-06102-439/+3177
| |\ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/jobs/show.html.haml # lib/gitlab/ci/status/core.rb
| * | | | Rename success to erased empty state specMatija Čupić2018-04-052-19/+28
| | | | |
| * | | | Fix job setup in success empty state specsMatija Čupić2018-04-042-6/+8
| | | | |
| * | | | Add success CI Build empty state statusMatija Čupić2018-04-042-0/+49
| | | | |
| * | | | Scrolls to the top of the page before erase clickFilipa Lacerda2018-04-041-1/+4
| | | | |
| * | | | [ci skip] Merge branch 'master' into 42568-pipeline-empty-stateFilipa Lacerda2018-04-04169-1768/+5538
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | | Properly set up job trace in user_browses_job_specMatija Čupić2018-04-031-5/+3
| | | | | |