summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Improve spec for Gitlab::Ci::Status::Pipeline::FactoryShinya Maeda2018-10-101-19/+49
| | | | | | | |
* | | | | | | | Only display merge commit SHA when it existsMark Chao2018-10-151-0/+10
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge branch '52614-update-job-started-check' into 'master'Tim Zallmann2018-10-121-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the check for started in job header See merge request gitlab-org/gitlab-ce!22329
| * | | | | | | Updates the check for started in job headerFilipa Lacerda2018-10-121-5/+5
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function that was checking if the job was started or not was expecting a boolean, however it was receiving a null. During the refactor the condition was changed, causing the function to break with null This commit fixes the check
* | | | | | | Add stage name in job.json responseSteve Azzopardi2018-10-126-29/+45
|/ / / / / /
* | | | | | Backport CE changes for Ops Dashboard in EEPeter Leitzen2018-10-122-0/+30
| | | | | |
* | | | | | Hide job sidebar on mobileFilipa Lacerda2018-10-121-1/+38
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | This commit adds back `js-` classes needed to automatically collapse the sidebar on resize.
* | | | | Fix broken file name navigation on MRsJacques Erasmus2018-10-111-3/+12
| |/ / / |/| | |
* | | | Merge branch '51712-prefer-jasmine-matcher' into 'master'Mike Greiling2018-10-1118-45/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4. enable jasmine/prefer-jasmine-matcher See merge request gitlab-org/gitlab-ce!22236
| * | | | enable jasmine/prefer-jasmine-matcherJohann Hubert Sonntagbauer2018-10-0918-45/+42
| |/ / /
* | | | Merge branch '51712-new-line-between-declarations' into 'master'Mike Greiling2018-10-1115-1/+115
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 1. enable jasmine/new-line-between-declarations See merge request gitlab-org/gitlab-ce!22230
| * | | | enable jasmine/new-line-between-declarationsJohann Hubert Sonntagbauer2018-10-0915-1/+115
| |/ / /
* | | | Fix erased block not being rendered when job was erasedFilipa Lacerda2018-10-112-4/+16
| | | |
* | | | Merge branch 'sh-fix-project-deletion-with-export' into 'master'Robert Speicher2018-10-111-3/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project deletion when there is a export available Closes #52362 See merge request gitlab-org/gitlab-ce!22276
| * | | | Fix project deletion when there is a export availableStan Hu2018-10-101-3/+20
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project deletions were failing with "Can't modify frozen hash" because: 1. Project#remove_exports was called in the after_destroy hook 2. This would remove the file and update ImportExportUpload 3. ImportExportUpload#save would attempt to write to a destroyed model To avoid this, we just check if ImportExportUpload has been destroyed before attempting to save it. This would have a side effect of not running after_commit hooks to delete the repository on disk, making it impossible to delete the project entirely. Closes #52362
* | | | Merge branch 'frontend-feature-flags' into 'master'Rémy Coutable2018-10-111-0/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support pushing of feature flags to the frontend Closes gitlab-org/release/framework#17 See merge request gitlab-org/gitlab-ce!22197
| * | | | Support pushing of feature flags to the frontendYorick Peterse2018-10-111-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a method to Gitlab::GonHelper called `push_frontend_feature_flag`. This method can be used to easily expose the state of a feature flag to Javascript code. For example, using this method we may write the following controller code: before_action do push_frontend_feature_flag(:vim_bindings) end def index # ... end def edit # ... end In Javascript we can then check the state of the flag as follows: if ( gon.features.vimBindings ) { // ... } Fixes https://gitlab.com/gitlab-org/release/framework/issues/17
* | | | | Merge branch '52472-pipeline-endpoint-json' into 'master'Tim Zallmann2018-10-111-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds `.json` to the end of pipelines endpoint Closes #52472 See merge request gitlab-org/gitlab-ce!22293
| * | | | | Adds `.json` to the end of pipelines endpointFilipa Lacerda2018-10-111-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the job page is rendered we fetch the pipeline endpoint to render the stages in the sidebar. Without `.json` the response is cached, and when the user goes back to the pipeline's page it renders the json output instead of the Vue app
* | | | | Stuck block URL links to runners settingsFilipa Lacerda2018-10-111-1/+1
| | | | |
* | | | | Feature improved branch filter sortingJason Rutherford2018-10-111-1/+32
| | | | |
* | | | | Add new sort option "most_stars" to "Group > Children" pagesRene Hennig2018-10-111-0/+21
|/ / / /
* | | | Convert remaining issue board components into ES module syntaxMike Greiling2018-10-1010-88/+87
| | | |
* | | | Enhance and test JSON schema for deploymentsPeter Leitzen2018-10-103-5/+62
| |_|/ |/| |
* | | Remove Git circuit breakerZeger-Jan van de Weg2018-10-1022-936/+11
| |/ |/| | | | | | | | | | | Was introduced in the time that GitLab still used NFS, which is not required anymore in most cases. By removing this, the API it calls will return empty responses. This interface has to be removed in the next major release, expected to be 12.0.
* | Resolve "Harmonize prettier and eslint configs"Mike Greiling2018-10-0916-17/+14
| |
* | Merge branch 'sh-handle-invalid-comparison' into 'master'Douwe Maan2018-10-091-0/+24
|\ \ | | | | | | | | | | | | | | | | | | Reject invalid branch names in repository compare controller Closes #51003 See merge request gitlab-org/gitlab-ce!22186
| * | Reject invalid branch names in repository compare controllerStan Hu2018-10-081-0/+24
| | | | | | | | | | | | Closes #51003
* | | Merge branch 'rails5-user-status-spec' into 'master'Sean McGivern2018-10-091-0/+2
|\ \ \ | | | | | | | | | | | | | | | | Rails5: fix user edit profile clear status spec See merge request gitlab-org/gitlab-ce!22169
| * | | Rails5: fix user edit profile clear status specJasper Maes2018-10-061-0/+2
| | | |
* | | | Merge branch 'osw-remove-dead-code-on-mr-show' into 'master'Robert Speicher2018-10-081-22/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes expensive dead code on main MR page request Closes #51172 See merge request gitlab-org/gitlab-ce!22153
| * | | | Remove dead code on main MR pageOswaldo Ferreira2018-10-051-22/+0
| | | | |
* | | | | Clean up ActiveRecord code in TodoServiceYorick Peterse2018-10-084-2/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors the TodoService class according to our code reuse guidelines. The resulting code is a wee bit more verbose, but it allows us to decouple the column names from the input, resulting in fewer changes being necessary when we change the schema. One particular noteworthy line in TodoService is the following: todos_ids = todos.update_state(state) Technically this is a violation of the guidelines, because `update_state` is a class method, which services are not supposed to use (safe for a few allowed ones). I decided to keep this, since there is no alternative. `update_state` doesn't produce a relation so it doesn't belong in a Finder, and we can't move it to another Service either. As such I opted to just use the method directly. Cases like this may happen more frequently, at which point we should update our documentation with some sort of recommendation. For now, I want to refrain from doing so until we have a few more examples.
* | | | | Clean up ActiveRecord code in TodosFinderYorick Peterse2018-10-083-1/+92
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors the TodosFinder finder according to the new code reuse rules, as enforced by the CodeReuse cops. I also changed some of the methods to use regular if statements, instead of assignments and/or early returns. This results in a more natural flow when reading the code, and it makes it harder to accidentally return the wrong result.
* | | | Merge branch 'Fix-pipeline-redirect' into 'master'Grzegorz Bizon2018-10-081-16/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect to the pipeline builds page when a build is canceled Closes #39161 See merge request gitlab-org/gitlab-ce!21595
| * | | | Redirect to the pipeline builds page when a build is canceledEva Kadlecová2018-09-171-16/+49
| | | | |
* | | | | Merge branch 'rails5-mysql-schedule-build' into 'master'Douwe Maan2018-10-083-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Rails 5: fix mysql milliseconds problems in scheduled build specs See merge request gitlab-org/gitlab-ce!22170
| * | | | | Rails 5: fix mysql milliseconds problems in scheduled build specsJasper Maes2018-10-063-3/+3
| | |_|/ / | |/| | |
* | | | | Merge branch 'increase-event-retention-prune-old-events-worker' into 'master'Douwe Maan2018-10-081-7/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Prune events older than 2 years instead of 12 months See merge request gitlab-org/gitlab-ce!22145
| * | | | | Added new test and updated all event idsJeremy Watson2018-10-051-3/+8
| | | | | |
| * | | | | Renamed test eventsJeremy Watson2018-10-051-2/+3
| | | | | |
| * | | | | Updated existing spec for new 2 year timeframeJeremy Watson2018-10-051-3/+3
| | | | | |
* | | | | | Merge branch 'backport-ce-to-ee-spec-fix' into 'master'Rémy Coutable2018-10-081-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Fix issues controller N+1 failure See merge request gitlab-org/gitlab-ce!22141
| * | | | | Fix issues controller N+1 failureSean McGivern2018-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE needs :request_store to cache license queries - otherwise we will blow past the query limit just with `SELECT * FROM licenses` over and over.
* | | | | | Merge branch 'bw-fix-checking-disabled-services' into 'master'51761-create-new-project-auto-populate-project-slug-string-to-project-name-if-name-is-empty34758-split-create-gcp-controllerStan Hu2018-10-061-8/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check disabled_services when finding a service See merge request gitlab-org/gitlab-ce!22172
| * | | | | | Check disabled_services when finding a serviceBrett Walker2018-10-061-8/+28
| | | | | | |
* | | | | | | Fix invalid parent path on group settings pageDmitriy Zaporozhets2018-10-061-0/+16
|/ / / / / /
* | | | | | Add button to insert table in markdown editorGeorge Tsiolis2018-10-061-2/+11
| |_|/ / / |/| | | |
* | | | | Fix LFS uploaded images not being renderedOswaldo Ferreira2018-10-056-6/+39
| | | | |
* | | | | Merge branch 'ee-7126-admin-projects-geo-status' into 'master'Douglas Barbosa Alexandre2018-10-051-0/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | EE Backport: enable Geo Status widget in admin/projects See merge request gitlab-org/gitlab-ce!22161