summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixes empty block in MR widget60462-empty-pipeline-sectionFilipa Lacerda2019-05-074-2/+40
| | | | | This commit prevents the pipeline block to be rendered when no pipeline information is provided
* Merge branch 'gitaly-version-v1.42.0' into 'master'Douwe Maan2019-05-072-1/+6
|\ | | | | | | | | Upgrade Gitaly to v1.42.0 See merge request gitlab-org/gitlab-ce!28135
| * Upgrade Gitaly to v1.42.0GitalyBot2019-05-072-1/+6
|/
* Merge branch 'dz-registry-proxy-ui-ce' into 'master'Tim Zallmann2019-05-071-0/+1
|\ | | | | | | | | CE Backport for Dependency Proxy UI See merge request gitlab-org/gitlab-ce!27965
| * Backport change to group sidebardz-registry-proxy-ui-cemfluharty2019-05-011-0/+1
| |
* | Merge branch 'sh-cleanup-import-export' into 'master'James Lopez2019-05-073-4/+37
|\ \ | | | | | | | | | | | | | | | | | | Clean up CarrierWave's import/export files Closes #60656 See merge request gitlab-org/gitlab-ce!27487
| * | Clean up CarrierWave's import/export filesStan Hu2019-05-073-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike uploads that have been uploaded with Tempfile, the project import/export archives are stored in a temporary cache directory and remain there if: 1. Object storage is enabled 2. `move_to_store` is set to `true`. CarrierWave will leave these files there until disk space runs out or a clean step is run manually. If `move_to_store` is set to `false`, CarrierWave will remove the files after storing them. However, unlike a local file, with object storage, the file is still copied, so setting `move_to_store` to `true` doesn't buy us anything. To ensure files are cleaned up, we can just inherit from the GitlabUploader implementation of `move_to_store`, which returns `true` if it's a local file, `false` otherwise. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60656
* | | Merge branch 'friendly-wrap-component' into 'master'Tim Zallmann2019-05-072-0/+9
|\ \ \ | | | | | | | | | | | | | | | | Add wbr style for IE11 compatibility See merge request gitlab-org/gitlab-ce!27846
| * | | Add wbr style for IE11 compatibilityfriendly-wrap-componentPaul Gascou-Vaillancourt2019-05-062-0/+9
| | | |
* | | | Merge branch '59930-todos-scss' into 'master'Phil Hughes2019-05-072-35/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleans up todos.scss style-lint warnings Closes #59930 See merge request gitlab-org/gitlab-ce!28076
| * | | | Cleans up todos.scss stylelint warnings59930-todos-scssFilipa Lacerda2019-05-032-35/+28
| | | | |
* | | | | Merge branch 'winh-separate-frontend-fixtures' into 'master'Phil Hughes2019-05-078-10/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Generate EE-specific JavaScript fixtures into ee/ directory (CE-backport) See merge request gitlab-org/gitlab-ce!28032
| * | | | | Load EE fixtures from ee/ directory in Jestwinh-separate-frontend-fixturesWinnie Hellmann2019-05-022-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 2917a28a885922a03f2026ddbb2680bc2b6e5d50)
| * | | | | Load EE fixtures from ee/ directory in KarmaWinnie Hellmann2019-05-022-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 7cde57bf7367bce130a2e7f149c8dafd362de3f8)
| * | | | | Generate EE frontend fixtures into ee/ directoryWinnie Hellmann2019-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit d4ce3c720ecb52f2a9153133bbd47fa358c5d7b6)
| * | | | | Allow to override Gitlab.ee? with IS_GITLAB_EEWinnie Hellmann2019-05-021-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit f3b74d59865a88be67663339447667c725961413)
| * | | | | Ignore PDF and balsamiq fixture filesWinnie Hellmann2019-05-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 1b33828811897b6a3f8a38044cc0839b87098d1f)
* | | | | | Merge branch '61278-next' into 'master'Phil Hughes2019-05-073-5/+23
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only renders Next badge for gitlab.com Closes #61278 See merge request gitlab-org/gitlab-ce!28056
| * | | | | Only renders Next badge for gitlab.comFilipa Lacerda2019-05-073-5/+23
|/ / / / /
* | | | | Merge branch 'allow-replying-to-individual-notes-from-api' into 'master'James Lopez2019-05-075-11/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow replying to an individual note in the API Closes #61392 See merge request gitlab-org/gitlab-ce!28120
| * | | | | Allow replying to an individual note in the APIallow-replying-to-individual-notes-from-apiSean McGivern2019-05-065-11/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you can do this in the UI, you should be able to do it in the API. If a discussion is not a single note discussion, or it is replyable, you can reply to it.
* | | | | | Merge branch 'strip-attr-cron-in-pipeline-schedule' into 'master'Grzegorz Bizon2019-05-072-0/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strip whitespace for PipelineSchedule#cron See merge request gitlab-org/gitlab-ce!27990
| * | | | | | Strip whitespace for PipelineSchedule#cronstrip-attr-cron-in-pipeline-scheduleFabio Pitino2019-05-022-0/+12
| | | | | | |
* | | | | | | Merge branch 'instance_level_clusters' into 'master'Bob Van Landuyt2019-05-0739-45/+1109
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instance level k8s clusters See merge request gitlab-org/gitlab-ce!27196
| * | | | | | | Remove duplicate clusterable presenter methodinstance_level_clustersJames Fargher2019-05-075-26/+0
| | | | | | | |
| * | | | | | | Convert instance level clusters enabled to class methodJames Fargher2019-05-073-7/+3
| | | | | | | |
| * | | | | | | Change specs to match gitlab code standardsJames Fargher2019-05-073-19/+23
| | | | | | | |
| * | | | | | | Stop using `go` function in clusters controller specsJames Fargher2019-05-071-54/+54
| | | | | | | |
| * | | | | | | Check instance cluster feature at policy levelJames Fargher2019-05-0710-36/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to simplify feature flag checks by using policies
| * | | | | | | Allow projects to use instance level clustersJames Fargher2019-05-077-11/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two cluster hierarchies one for the deployment platform and one for controllers. The main difference is that deployment platforms do not check user permissions and only return the first match.
| * | | | | | | Instance level kubernetes clusters adminJames Fargher2019-05-0727-5/+969
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instance level clusters were already mostly supported, this change adds admin area controllers for cluster CRUD
* | | | | | | | Merge branch 'sh-fix-activerecord-patch-mark2' into 'master'Stan Hu2019-05-073-11/+37
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional fix to handle NULL lock_version See merge request gitlab-org/gitlab-ce!28153
| * | | | | | | | Additional fix to handle NULL lock_versionsh-fix-activerecord-patch-mark2Stan Hu2019-05-063-11/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the UI sends a string value for lock_version (e.g. "0"), then the previous monkey patch did not properly handle that properly. This commit casts the value to an integer to determine whether to look for NULL lock_versions. For merge requests, GitLab sends a POST request to `namespace/project/merge_requests/:iid` with the `merge_request[lock_version]` parameter with a string `0`. The string value comes from the form field, which explains why https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28145 wasn't sufficient.
* | | | | | | | | Merge branch 'sh-fix-ldap-members-icon-ce' into 'master'Kushal Pandya2019-05-072-4/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport members SCSS changes See merge request gitlab-org/gitlab-ce!28115
| * | | | | | | | | Backport members SCSS changessh-fix-ldap-members-icon-ceStan Hu2019-05-062-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit backports the changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12304.
* | | | | | | | | | Merge branch '56992-add-filtering-to-project-dashboard-fe' into 'master'Kushal Pandya2019-05-0723-51/+575
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add filtering to project dashboard [FE]" Closes #56992 See merge request gitlab-org/gitlab-ce!25231
| * | | | | | | | | | Updated translation strings56992-add-filtering-to-project-dashboard-feEzekiel Kigbo2019-05-061-3/+0
| | | | | | | | | | |
| * | | | | | | | | | Cleanup css classes and stylesEzekiel Kigbo2019-05-066-30/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use class and id syntax for button attributes Use feature flag variable and shorthand if expression Use shorthand if expression Use a classname instead of tag Simplify common rules Use size variable Move flex grow and shrink to utility classes Extract redused classes Remove unecessary styles
| * | | | | | | | | | Added blank lines to meet style guideEzekiel Kigbo2019-05-0614-79/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Un-nest title variable output Update spec test names Rename sort_value_most_stars -> sort_value_stars_desc Rename sorted_by_stars -> sorted_by_stars_desc Renname sort_value_most_stars_asc -> sort_value_stars_asc Invert feature check, assign feature condition to a variable Inline conditional nav bar rendering Invert conditional label Added follow up task Fix filters returning 0 projects show the wrong view Move click action out of test expectation Use proper variable name for project in before block Rename projects_sort_admin_options_hash Renamed projects_sort_admin_options_has to old_projects_sort_options_hash as its not only used on the admin screen Fix extra whitespace errors Stub project_list_filter_bar in the projects_helper specs Added follow up task for `show_projects?` Removed url test expectations
| * | | | | | | | | | Minor review fixesEzekiel Kigbo2019-05-0616-68/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings Simplify locals passed through views Ensure we can still filter when logged out Cleanup conditional rendering for explore filters
| * | | | | | | | | | Update project list specsEzekiel Kigbo2019-05-068-114/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests to ensure search only executes with a button click or enter, sort by Name, Last updated, Created date and Stars and tests for Visibility filter
| * | | | | | | | | | Ensure we dont apply changes to admin/projectsEzekiel Kigbo2019-05-067-70/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes introduced for the project filter bar should not apply to the admin projects screen. Remove "Owned by me", "Owned by anyone" options Update the dropdown option Last created -> Created date. Introduces fixes for spacing and minor styling across breakpoints.
| * | | | | | | | | | Added sorted_by_stars_asc scope to projects modelEzekiel Kigbo2019-05-061-0/+3
| | | | | | | | | | |
| * | | | | | | | | | Updated layout for various breakpointsEzekiel Kigbo2019-05-0612-74/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated translations Adds sort direction dropdown Allows the project list sorting direction to be changed, available options can be sorted ascending or descending. Implements the changes from the UX review.
| * | | | | | | | | | Added filter bar to project pageEzekiel Kigbo2019-05-068-15/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added project_list_filter_bar feature flag
* | | | | | | | | | | Merge branch 'fix-schedule-head-pipeline-update-method' into 'master'Ash McKenzie2019-05-073-19/+28
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix update head pipeline process of Pipelines for merge requests See merge request gitlab-org/gitlab-ce!28057
| * | | | | | | | | | | Fix schedule head pipeline updatefix-schedule-head-pipeline-update-methodShinya Maeda2019-05-063-19/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, schedule head pipeline update method which executed after pipeline creation does not take into account of merge reqeust pipelines. We should use dedicated `all_merge_requests` method in this case.
* | | | | | | | | | | | Merge branch 'docs-destroy-the-mirrors' into 'master'Evan Read2019-05-072-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct repo mirror SSH key generation docs See merge request gitlab-org/gitlab-ce!27998
| * | | | | | | | | | | | Correct repo mirror SSH key generation docsdocs-destroy-the-mirrorsLuke Bennett2019-05-032-2/+4
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'winh-refactoring-issue-template-docs' into 'master'Stan Hu2019-05-061-0/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add issue template for refactorings See merge request gitlab-org/gitlab-ce!27889