summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Allow usage of quick actions for internal usersPeter Leitzen2019-05-061-1/+0
| | | | Just prevent support bots from using quick actions in EE
* Run rubocop -a on CE filessh-upgrade-rubocop-0.68.0-ceStan Hu2019-05-0513-18/+18
|
* Resolve "Sort by due date and popularity in both directions"Nermin Vehabovic2019-05-041-2/+16
|
* Merge branch '59365-include-time-window-parameters-in-the-url-query-string' ↵Fatih Acet2019-05-032-23/+29
|\ | | | | | | | | | | | | | | | | into 'master' Resolve "Include time window parameters in the URL query string" Closes #59365 See merge request gitlab-org/gitlab-ce!27230
| * Make time window parameters available in the query string59365-include-time-window-parameters-in-the-url-query-stringJose Vargas2019-05-012-23/+29
| | | | | | | | | | This commit adds the frontend functionality to add the parameters via the `pushState` api, preventing the need for a page reload.
* | Merge branch '10763-track-uninstall-button-clicks-ce' into 'master'Filipa Lacerda2019-05-032-1/+14
|\ \ | | | | | | | | | | | | CE Backport of tracking uninstall button click See merge request gitlab-org/gitlab-ce!28012
| * | CE-backport track uninstall button clicks10763-track-uninstall-button-clicks-ceEnrique Alcantara2019-05-022-1/+14
| | |
* | | Allow guests users to access project releasesKrasimir Angelov2019-05-034-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is step one of resolving https://gitlab.com/gitlab-org/gitlab-ce/issues/56838. Here is what changed: - Revert the security fix from bdee9e8412d. - Do not leak repository information (tag name, commit) to guests in API responses. - Do not include links to source code in API responses for users that do not have download_code access. - Show Releases in sidebar for guests. - Do not display links to source code under Assets for users that do not have download_code access. GET ':id/releases/:tag_name' still do not allow guests to access releases. This is to prevent guessing tag existence.
* | | Internationalisation of reports directoryBrandon Labuschagne2019-05-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | Merge branch 'expand-diff-performance' into 'master'Filipa Lacerda2019-05-039-77/+193
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Impove the performance of expanding full diff Closes #58597 See merge request gitlab-org/gitlab-ce!27413
| * | | Impove the performance of expanding full diffPhil Hughes2019-05-039-77/+193
| | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58597
* | | | Internationalisation of javascript/s* directoriesBrandon Labuschagne2019-05-033-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | Merge branch ↵Phil Hughes2019-05-032-38/+94
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '9971-move-ee-differences-for-app-assets-javascripts-notes-components-note_form-vue-ce' into 'master' EE Backport to CE of EE!11151 See merge request gitlab-org/gitlab-ce!27824
| * | | | EE Backport to CE of Note Form EE Diffs9971-move-ee-differences-for-app-assets-javascripts-notes-components-note_form-vue-ceSam Bigelow2019-05-022-38/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves all EE Specific lines into the ee directory CE Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11151/commits?view=parallel
* | | | | Add gitlab-managed option to clusters formMayra Cabrera2019-05-038-13/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Use git_garbage_collect_worker to run pack_refsJan Provaznik2019-05-022-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PackRefs is not an expensive gitaly call - we want to call it more often (than as part of full `gc`) because it helps to keep number of refs files small - too many refs file may be a problem for deployments with slow storage.
* | | | | Adds a way to start multiple manual jobs in stageMayra Cabrera2019-05-029-5/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds an endpoint on PipelinesController - Adds a service that iterates over every build in a stage and plays it. - Includes 'play_manual' details on EntitySerializer - Builds a new Stage state: PlayManual. An stage can take this status if it has manual builds or an skipped, scheduled or manual status - Includes FE modifications and specs
* | | | | Add support for two-step Gitaly Rebase RPCLuke Duncalfe2019-05-022-15/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new two-step Gitaly `Rebase` RPC yields the rebase commit SHA to the client before proceeding with the rebase. This avoids an issue where the rebase commit SHA was returned when the RPC had fully completed, and in some cases this would be after the Rails `post_receive` worker services had already run. In these situations, the merge request did not yet have its rebase_commit_sha attribute set introducing the possibility for bugs (such as previous approvals being reset). https://gitlab.com/gitlab-org/gitlab-ee/issues/5966
* | | | | Merge branch '27777-drop-projects-ci_id-column' into 'master'Douglas Barbosa Alexandre2019-05-021-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Drop "projects"."ci_id" column" Closes #27777 See merge request gitlab-org/gitlab-ce!27623
| * | | | | Remove unused projects.ci_id column27777-drop-projects-ci_id-columnDmitriy Zaporozhets2019-05-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And remove Gitlab::Ci::Trace#deprecated_path as it relies on ci_id Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'remove-comment-personal-snippet-permission' into 'master'Douwe Maan2019-05-023-18/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the `comment_personal_snippet` permission Closes #56688 See merge request gitlab-org/gitlab-ce!27999
| * | | | | | Remove the `comment_personal_snippet` permissionremove-comment-personal-snippet-permissionSean McGivern2019-05-023-18/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is now entirely handled by `create_note`: 1. Project snippets prevent `create_note`. 2. Uploads already only support routing for personal snippets. This simplifies some policies and access checks, too!
* | | | | | | Update deployment chat message notificationJason Goodman2019-05-021-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include link to user and commit title. Rearrange text
* | | | | | | Add packages_size to ProjectStatisticsAlessio Caiazza2019-05-025-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '9932-fix-deprecated-attribute_changed-ce' into 'master'Andreas Brandl2019-05-0212-39/+51
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | [CE] Remove deprecated usage of `attribute_changed?` See merge request gitlab-org/gitlab-ce!27577
| * | | | | | Remove deprecated uses of attribute_changed?9932-fix-deprecated-attribute_changed-ceHeinrich Lee Yu2019-04-3012-39/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepares us for upgrade to Rails 5.2
* | | | | | | Uninstall application confirm modal componentEnrique Alcántara2019-05-0210-40/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Vue confirmation modal implementation - CSS tweaks for modal default height
* | | | | | | Internationalisation of diff_note directoryBrandon Labuschagne2019-05-026-14/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | | Internationalisation of pages directoryBrandon Labuschagne2019-05-025-22/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | | Merge branch 'fix-ide-relative-url-bug' into 'master'Phil Hughes2019-05-021-3/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Fix IDE get file data with '/' as relative root See merge request gitlab-org/gitlab-ce!27911
| * | | | | | Fix IDE get file data with '/' as relative rootfix-ide-relative-url-bugPaul Slaughter2019-04-301-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/60932
* | | | | | | Internationalisation of merge_conflicts directoryBrandon Labuschagne2019-05-022-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | | Internationalisation of javascript/t* directoriesBrandon Labuschagne2019-05-022-2/+5
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | Merge branch ↵Filipa Lacerda2019-05-0214-62/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-2514-62/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge branch ↵Douwe Maan2019-05-021-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '53064-bypassing-pipeline-jobs-by-canceling-the-pipeline-and-manually-running-later-jobs' into 'master' Disable retrying cancelled jobs Closes #53064 See merge request gitlab-org/gitlab-ce!27503
| * | | | | | | Make canceled jobs not retryablemfluharty2019-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See which tests break
* | | | | | | | Add opentracing integration for graphqlJan Provaznik2019-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends existing graphql's tracer with opentracing measurements. Because it also adds Tracing::Graphql class (for opentracing), it also renames Graphql::Tracing class to Graphql::GenericTracing to minimize confusion with similar class names.
* | | | | | | | Merge branch 'sh-allow-equal-level-in-subgroup-membership' into 'master'James Lopez2019-05-021-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow a member to have an access level equal to parent group Closes gitlab-ee#11323 See merge request gitlab-org/gitlab-ce!27913
| * | | | | | | | Allow a member to have an access level equal to parent groupsh-allow-equal-level-in-subgroup-membershipStan Hu2019-04-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppose you have this configuration: 1. Subgroup `hello/world` 2. Subgroup `hello/mergers`. 3. Project `hello/world/my-project` has invited group `hello/world` to access protected branches. 4. The rule allows the group to merge but no one can push. 5. User `newuser` has Owner access to the parent group `hello`. Previously, there was no way for the user `newuser` to be added to the `hello/mergers` group since the validation only allowed a user to be added at a higher access level. Since membership in a subgroup confers certain access rights, such as being able to merge or push code to protected branches, we have to loosen the validation and allow someone to be added at an equal level granted by the parent group. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11323
* | | | | | | | | Allow Sentry client-side DSN to be passed on gitlab.ymlDouglas Barbosa Alexandre2019-05-012-2/+1
| | | | | | | | |
* | | | | | | | | Internationalisation of notes directoryBrandon Labuschagne2019-05-013-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | | | | Internationalisation of behaviors directoryBrandon Labuschagne2019-05-014-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | | | | Internationalisation of board directoryBrandon Labuschagne2019-05-014-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | | | | Internationalisation of filtered_search directoryBrandon Labuschagne2019-05-018-18/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | | | | Resolve "Move EE differences for ↵Natalia Tepluhina2019-05-012-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `app/assets/javascripts/notes/components/note_actions.vue`"
* | | | | | | | | Refactor mirror instructions viewFrancisco Javier López2019-05-012-1/+5
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Update metrics dashboard API to load yml from repoSarah Yasonik2019-05-012-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the EnvironmentController#metrics_dashboard endpoint to support a "dashboard" param, which can be used to specify the filepath of a dashboard configuration from a project repository. Dashboard configurations are expected to be stored in .gitlab/dashboards/. Updates dashboard post-processing steps to exclude custom metrics, which should only display on the system dashboard.