summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix undefined method `one?` when pushing to an existing merge requestsh-fix-issue-45152Stan Hu2018-04-073-4/+16
| | | | | | | | 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 '31591-project-deploy-tokens-to-allow-permanent-access' into ↵Kamil Trzciński2018-04-0747-38/+1010
|\ | | | | | | | | | | | | | | | | 'master' Create Project Deploy Tokens to allow permanent access to repo and registry Closes #31591 See merge request gitlab-org/gitlab-ce!17894
| * Use proper auth_scope for deploy tokenKamil Trzciński2018-04-072-3/+3
| |
| * Handle limit for datetime attributes on MySQLMayra Cabrera2018-04-0612-55/+89
| | | | | | | | | | | | | | | | | | | | | | 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
| * Modifies index on DeployTokens to use idMayra Cabrera2018-04-062-2/+2
| |
| * Handles default expires_at date directly into DeployToken modelMayra Cabrera2018-04-066-7/+17
| |
| * Removes deploy tokens presenterMayra Cabrera2018-04-064-37/+2
| |
| * Addresses database commentsMayra Cabrera2018-04-0612-26/+50
| | | | | | | | | | | | | | - 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
| * Fix form javascriptKamil Trzciński2018-04-064-19/+25
| |
| * Increase test suite around deploy tokens behaviorMayra Cabrera2018-04-0617-220/+144
| | | | | | | | Also, fixes broken specs
| * Fixes broken schema and minor changesMayra Cabrera2018-04-067-12/+11
| |
| * Get rid of Redis when dealing with deploy tokensKamil Trzciński2018-04-0611-87/+52
| | | | | | | | We use controller actions to pass a newly created token and errors
| * Fix and optimise DB schemaKamil Trzciński2018-04-063-21/+19
| |
| * Include ProjectDeployTokensMayra Cabrera2018-04-0626-132/+197
| | | | | | | | | | | | Also: - Changes scopes from serializer to use boolean columns - Fixes broken specs
| * Support Deploy Tokens properly without hacking abilitiesKamil Trzciński2018-04-068-28/+43
| |
| * Addreses backend review suggestionsMayra Cabrera2018-04-0613-20/+74
| | | | | | | | | | | | - 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-067-71/+121
| | | | | | | | | | | | | | - 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
| * Fix i18n on deploy_token viewsMayra Cabrera2018-04-067-25/+25
| |
| * Addreses frontend reviewMayra Cabrera2018-04-068-27/+27
| | | | | | | | Also fixes spec failures on presenter and docs
| * Add documentation for DeployTokenMayra Cabrera2018-04-065-4/+84
| |
| * Implement read_registry for DeployTokensMayra Cabrera2018-04-062-10/+40
| |
| * Address UX reviewMayra Cabrera2018-04-0612-50/+103
| | | | | | | | | | | | | | | | - 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-067-19/+184
| | | | | | | | This will allow to download a repo using the token from the DeployToken
| * Create barebones for DeploytokenMayra Cabrera2018-04-0627-1/+536
| | | | | | | | | | | | | | | | | | | | 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 'blackst0ne-bump-parser-2-5-0-5' into 'master'Stan Hu2018-04-072-4/+4
|\ \ | |/ |/| | | | | Bump `parser` gem to 2.5.0.5 See merge request gitlab-org/gitlab-ce!18237
| * Bump `parser` gem to 2.5.0.5blackst0ne-bump-parser-2-5-0-5blackst0ne2018-04-072-4/+4
|/ | | | | | | | 1. Synchronize used version of `parser` gem for both versions of rails: 4 and 5. 2. Fix broken CI pipelines for rails5 branches. The 2.5.0.4 version is removed from rubygems, so it's skipped. https://github.com/whitequark/parser/issues/478
* Merge branch 'fix-dashboard-sorting' into 'master'Clement Ho2018-04-072-1/+6
|\ | | | | | | | | Fix Prometheus dashboard sorting See merge request gitlab-org/gitlab-ce!18233
| * Fix dashboard sortingJoshua Lambert2018-04-062-1/+6
|/
* Merge branch 'sh-fix-recaptcha-test' into 'master'Stan Hu2018-04-062-4/+1
|\ | | | | | | | | | | | | 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-062-4/+1
| | | | | | | | | | | | | | 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-0632-58/+513
|\ \ | | | | | | | | | | | | | | | | | | 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-06341-3517/+25979
| |\ \ | | | | | | | | | | | | | | | | # 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-054-22/+31
| | | |
| * | | Fix job setup in success empty state specsMatija Čupić2018-04-043-7/+9
| | | |
| * | | Add success CI Build empty state statusMatija Čupić2018-04-044-1/+72
| | | |
| * | | 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-04543-4573/+11048
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | | |
| * | | | Properly set up jobs in mini pipeline graph specMatija Čupić2018-04-031-4/+5
| | | | |
| * | | | Set up traces in build show specMatija Čupić2018-04-031-8/+9
| | | | |
| * | | | Add action_button_title Core status methodMatija Čupić2018-04-031-0/+4
| | | | |
| * | | | Add specs for empty states .matches? methodsMatija Čupić2018-03-295-1/+110
| | | | |
| * | | | Move action button titles to respective statusesMatija Čupić2018-03-2911-5/+35
| | | | |
| * | | | Merge branch 'master' into 42568-pipeline-empty-stateMatija Čupić2018-03-28976-6040/+25619
| |\ \ \ \
| * | | | | Move the empty state extended status to be the beginningMatija Čupić2018-03-282-15/+17
| | | | | |
| * | | | | Fix tests for build empty state statusesMatija Čupić2018-03-2810-20/+57
| | | | | |
| * | | | | 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-282-1/+3
| | | | | |
View Lorry Controller Status