summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Rename methods that conflict in Rails 5.255583-rename-method-conflictsHeinrich Lee Yu2019-05-122-4/+4
| | | | | Adds suffix to enum methods and changes `in_groups` to `of_groups`
* Open merge collab link in new tabtrojkilla2019-05-091-1/+1
| | | | fixes clearing checked settings
* Merge branch 'support-string-piwik-website-ids' into 'master'Phil Hughes2019-05-091-1/+1
|\ | | | | | | | | | | | | Supports Matomo/Piwik string website ID ("Protect Track ID" plugin) Closes #61606 See merge request gitlab-org/gitlab-ce!28214
| * Adds quotes to Matomo/Piwik website IDCDuv2019-05-081-1/+1
| | | | | | | | | | | | | | | | When using Matomo/Piwik integration, only integer website IDs can be used. If using the "Protect Track ID" Matomo plugin (https://plugins.matomo.org/ProtectTrackID), website IDs are strings which the "_piwik.html.haml" layout file does not supports because it assumes "extra_config.piwik_site_id" variable contains an integer and prints it to JavaScript code without quotes. This commits surrounds "extra_config.piwik_site_id" variable with double quotes (") so that it works with both integers and strings. Issue: #61606
* | Merge branch '6105-move-ee-differences-group-members' into 'master'Phil Hughes2019-05-091-0/+2
|\ \ | | | | | | | | | | | | CE: Move EE differences for app/views/groups/group_members/index.html.haml See merge request gitlab-org/gitlab-ce!28026
| * | CE: Move EE differences for6105-move-ee-differences-group-membersDonald Cook2019-05-071-0/+2
| | | | | | | | | | | | app/views/groups/group_members/index.html.haml
* | | i18n: externalize strings from user profile settingsantony liu2019-05-092-8/+8
| | |
* | | Resolve CE/EE diffs in admin/projects/show viewadmin-projects-show-scbLuke Bennett2019-05-081-0/+2
| | | | | | | | | | | | Part of single codebase changes.
* | | Merge branch '6361-move-ee-notify-text-haml' into 'master'Phil Hughes2019-05-081-0/+2
|\ \ \ | | | | | | | | | | | | | | | | CE: Fixes EE differences for app/views/repository_check_mailer/notify.text.haml See merge request gitlab-org/gitlab-ce!28022
| * | | CE: Fixes EE differences for6361-move-ee-notify-text-hamlDonald Cook2019-05-071-0/+2
| |/ / | | | | | | | | | app/views/repository_check_mailer/notify.text.haml
* | | Merge branch 'fe-header-row' into 'master'Phil Hughes2019-05-083-9/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adds header column to variables list Closes #46806 See merge request gitlab-org/gitlab-ce!28060
| * | | Adds header column to variables listfe-header-rowFilipa Lacerda2019-05-073-9/+26
| | | | | | | | | | | | | | | | | | | | For the variables list in CI/CD settings this commits adds an header row with titles
* | | | Added user time settings fields to profileEzekiel Kigbo2019-05-072-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | Udpated user_edit_profile_spec with time preferences Minor update form fields
* | | | Merge branch 'sh-fix-related-merge-requests-path' into 'master'Rémy Coutable2019-05-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a path for the related merge requests endpoint Closes #61280 See merge request gitlab-org/gitlab-ce!28171
| * | | | Use a path for the related merge requests endpointsh-fix-related-merge-requests-pathStan Hu2019-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hosts using a non-standard configuration may have a different hostname/port/scheme than what may be configured on the GitLab server. While expose_url should generate a proper URL, there are cases where it may not work. Since we don't need the full URL, we can use the relative path. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61280
* | | | | Add external dashboard linkAdriel Santiago2019-05-072-0/+3
|/ / / / | | | | | | | | | | | | | | | | Add settings for linking to external dashboard from metrics dashboard
* | | | Merge branch 'show-disabled-mirrors' into 'master'Nick Thomas2019-05-073-15/+18
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | CE Show disabled project repo mirrors See merge request gitlab-org/gitlab-ce!27326
| * | | Show disabled project repo mirrorsshow-disabled-mirrorsLuke Bennett2019-05-073-15/+18
| | | | | | | | | | | | | | | | | | | | Show disabled mirrors with a badge so that they can be deleted by project owners.
* | | | 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 '59930-todos-scss' into 'master'Phil Hughes2019-05-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-031-1/+1
| | |_|/ | |/| |
* | | | Only renders Next badge for gitlab.comFilipa Lacerda2019-05-071-2/+3
| | | |
* | | | Merge branch 'instance_level_clusters' into 'master'Bob Van Landuyt2019-05-071-0/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Instance level k8s clusters See merge request gitlab-org/gitlab-ce!27196
| * | | | Check instance cluster feature at policy levelJames Fargher2019-05-071-11/+12
| | | | | | | | | | | | | | | | | | | | Try to simplify feature flag checks by using policies
| * | | | Instance level kubernetes clusters adminJames Fargher2019-05-071-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Instance level clusters were already mostly supported, this change adds admin area controllers for cluster CRUD
* | | | | Merge branch 'sh-fix-ldap-members-icon-ce' into 'master'Kushal Pandya2019-05-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport members SCSS changes See merge request gitlab-org/gitlab-ce!28115
| * | | | | Backport members SCSS changessh-fix-ldap-members-icon-ceStan Hu2019-05-061-1/+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-0714-43/+137
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add filtering to project dashboard [FE]" Closes #56992 See merge request gitlab-org/gitlab-ce!25231
| * | | | | Cleanup css classes and stylesEzekiel Kigbo2019-05-065-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-067-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0613-55/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-064-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-065-49/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Updated layout for various breakpointsEzekiel Kigbo2019-05-069-68/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-067-15/+60
| | |_|_|/ | |/| | | | | | | | | | | | | Added project_list_filter_bar feature flag
* | | | | Merge branch 'member-access-granted-leave-email-fe' into 'master'Fatih Acet2019-05-063-4/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE Add leave link to access_granted email See merge request gitlab-org/gitlab-ce!27892
| * | | | | Add leave link to access_granted emailmember-access-granted-leave-email-feLuke Bennett2019-05-033-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows users to leave a project/group that they have been added to. Add function to leave a namespace by url param If the `leave` param is present on a project/group show page, click the leave link.
* | | | | | Onboarding welcome pageMartin Wortschack2019-05-061-0/+1
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | - Add styles for blue popovers - Add render_if_exists to help menu for "Learn GitLab" menu item
* | | | | Show health graphs on group-levelPeter Leitzen2019-05-061-1/+1
| |/ / / |/| | | | | | | | | | | Tweak cluster helper and refactor its specs.
* | | | Destroy repo mirrors instead of disabling themLuke Bennett2019-05-063-23/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is important to destroy data related to repo mirrors when they are disabled. Use `_destroy` nested attribute instead of `enabled` for push mirrors. Call `remove_import_data` after saving a project if its pull mirror is disabled.
* | | | Implement support for CI variables of type fileKrasimir Angelov2019-05-061-0/+4
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Add env_var and file as supported types for CI variables. Variables of type file expose to users existing gitlab-runner behaviour - save variable value into a temp file and set the path to this file in an ENV var named after the variable key. Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/46806.
* | | Add gitlab-managed option to clusters formMayra Cabrera2019-05-033-5/+26
|/ / | | | | | | | | | | | | | | When this option is enabled, GitLab will create namespaces and service accounts as usual. When disabled, GitLab wont create any project specific kubernetes resources Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56557
* | Add packages_size to ProjectStatisticsAlessio Caiazza2019-05-022-13/+6
| | | | | | | | | | This new field will allow to keep track of the storage used by the packages features, it provides also aggregation at namespace level.
* | Merge branch ↵Filipa Lacerda2019-05-029-14/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '59898-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-commits-scss' into 'master' Resolve "Fix the following style-lint errors and warnings for `app/assets/stylesheets/pages/commits.scss`" Closes #59898 See merge request gitlab-org/gitlab-ce!27647
| * | Fix commits.scss style-lint errors59898-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-commits-scssScott Hampton2019-04-259-14/+14
| | | | | | | | | | | | Updating class names, and using existing utility classes.
* | | Merge branch 'masked-variables-docs-update' into 'master'Filipa Lacerda2019-05-021-1/+3
|\ \ \ | | | | | | | | | | | | | | | | Clarify masked variable message, add docs link See merge request gitlab-org/gitlab-ce!27156
| * | | Clarify masked variable message, add link to docsmasked-variables-docs-updatemfluharty2019-04-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Update error message "This variable will not be masked" to "Cannot use Masked Variable with current value" Add link to masked variables section to error message
* | | | Allow Sentry client-side DSN to be passed on gitlab.ymlDouglas Barbosa Alexandre2019-05-011-1/+0
| |_|/ |/| |
* | | Refactor mirror instructions viewFrancisco Javier López2019-05-011-1/+1
| | |