summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'remove-ee-specific-lines-from-plan-concerns' into 'master'Robert Speicher2018-09-184-13/+34
|\ | | | | | | | | Remove EE-specific lines from Plan concerns See merge request gitlab-org/gitlab-ce!21448
| * Fix bad conflicts resolutionLin Jen-Shin2018-09-171-2/+2
| |
| * Remove EE-specific code from ProtectedRefAccessSean McGivern2018-09-171-7/+11
| |
| * Remove EE-specific code from MentionableSean McGivern2018-09-173-6/+23
| |
| * Remove EE-specific code from IssuableSean McGivern2018-09-171-2/+2
| |
* | [QA] consolidate selector patterns (1_manage/login)Dan Davison2018-09-185-13/+13
| |
* | Improve cluster apps installation flowMike Greiling2018-09-1811-259/+374
| |
* | Improve TabHelper to clarify the use of Namespaces for the nav_linkGabriel Mazetto2018-09-182-2/+21
| |
* | Merge branch '51546-rails5-milestone-groups' into 'master'Yorick Peterse2018-09-182-2/+9
|\ \ | | | | | | | | | | | | | | | | | | Don't use MilestoneFinder for group milestones Closes #51546 See merge request gitlab-org/gitlab-ce!21780
| * | Don't use MilestoneFinder for group milestonesDouglas Barbosa Alexandre2018-09-182-2/+9
| | | | | | | | | | | | | | | | | | This refactors the DashboardGroupMilestone model so that it no longer uses the MilestoneFinder, instead using methods defined on the Milestone model directly.
* | | Resolve "Move filter dropdown from Font Awesome to our own icons"Constance Okoghenun2018-09-186-12/+13
|/ /
* | Merge branch '51564-fix-commit-email-usage' into 'master'Douwe Maan2018-09-182-5/+8
|\ \ | | | | | | | | | | | | | | | | | | Respect the user commit email in more places Closes #51564 See merge request gitlab-org/gitlab-ce!21773
| * | Guard against regressions in commit email specsNick Thomas2018-09-181-3/+4
| | |
| * | Use commit email for wiki actionsNick Thomas2018-09-171-1/+1
| | |
| * | Use the correct email address when committing via a file serviceNick Thomas2018-09-171-2/+4
| | |
* | | Merge branch ↵Douwe Maan2018-09-182-2/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '45754-open-issues-from-archived-project-listed-in-group-issue-board' into 'master' Resolve "Open issues from archived project listed in group issue board" Closes #45754 See merge request gitlab-org/gitlab-ce!21721
| * | | Filter out archived projects from issue/mr countBrett Walker2018-09-171-2/+2
| | | | | | | | | | | | | | | | Pass the 'non_archived' flag to finder methods
| * | | Filter out archived issues from group issue boardBrett Walker2018-09-141-0/+5
| | | |
* | | | Expose runners status information in job apiSteve Azzopardi2018-09-183-6/+19
| | | |
* | | | Merge branch 'sh-fix-commit-email-migration' into 'master'Nick Thomas2018-09-181-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a default commit email if migration has not completed Closes #51530 See merge request gitlab-org/gitlab-ce!21790
| * | | | Return a default commit email if migration has not completedStan Hu2018-09-151-1/+1
| |/ / / | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51530
* | | | Merge branch 'ml-qa-spec-use-ssh-key' into 'master'Robert Speicher2018-09-173-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a new scenario to add an SSH key, perform Git actions with it, and then remove the key See merge request gitlab-org/gitlab-ce!19754
| * | | | Add an SSH key and use it to clone and pushMark Lapierre2018-09-153-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds 2 end-to-end tests: 1. Add and remove an SSH key 2. Add an SSH key and use it to clone and push Includes changes to factories to allow Git actions via SSH
* | | | | Fix haml-lint error in 2FA codes partialRobert Speicher2018-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51585
* | | | | Merge branch 'fix-url-validator' into 'master'Douglas Barbosa Alexandre2018-09-171-3/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow UrlValidator to work with attr_encrypted See merge request gitlab-org/gitlab-ce!21776
| * | | | | Allow UrlValidator to work with attr_encryptedNick Thomas2018-09-171-3/+11
| | | | | |
* | | | | | Merge branch 'select-from-union' into 'master'Robert Speicher2018-09-1719-77/+132
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace direct use of Gitlab::SQL::Union with a "from_union" method Closes #51307 See merge request gitlab-org/gitlab-ce!21672
| * | | | | | Added FromUnion to easily select from a UNIONYorick Peterse2018-09-1719-77/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the module `FromUnion`, which provides the class method `from_union`. This simplifies the process of selecting data from the result of a UNION, and reduces the likelihood of making mistakes. As a result, instead of this: union = Gitlab::SQL::Union.new([foo, bar]) Foo.from("(#{union.to_sql}) #{Foo.table_name}") We can now write this instead: Foo.from_union([foo, bar]) This commit also includes some changes to make this new setup work properly. For example, a bug in Rails 4 (https://github.com/rails/rails/issues/24193) would break the use of `from("sub-query-here").includes(:relation)` in certain cases. There was also a CI query which appeared to repeat a lot of conditions from an outer query on an inner query, which isn't necessary. Finally, we include a RuboCop cop to ensure developers use this new module, instead of using Gitlab::SQL::Union directly. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/51307
* | | | | | | Merge branch 'decouple-file-row-from-ide' into 'master'Filipa Lacerda2018-09-175-326/+369
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decouple file row from IDE See merge request gitlab-org/gitlab-ce!21742
| * | | | | | | Decouple file row from IDEPhil Hughes2018-09-175-326/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the file row component re-usable ouside of the Web IDE Pre-request for https://gitlab.com/gitlab-org/gitlab-ce/issues/14249
* | | | | | | | Add 2fa buttonLuke Picciau2018-09-172-1/+7
| | | | | | | |
* | | | | | | | Merge branch '51093-add-runner-json-schema-and-factory' into 'master'Kamil Trzciński2018-09-171-2/+5
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add runner JSON schema" Closes #51093 See merge request gitlab-org/gitlab-ce!21525
| * | | | | | | Add runner JSON schemaSteve Azzopardi2018-09-171-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51093
* | | | | | | | Backport EE changes to ↵Lukas Eipert2018-09-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js`
* | | | | | | | Merge branch '50956-web-terminal' into 'master'Phil Hughes2018-09-171-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include correct CSS file for xterm in environments page Closes #50956 See merge request gitlab-org/gitlab-ce!21768
| * | | | | | | Include correct CSS file for xterm in environments pageFilipa Lacerda2018-09-171-1/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the xterm dependency was moved to a npm dependency the CSS file path was not updated correctly in the environments page. In order for xterm to render properly, it needs the correct CSS path.
* | | | | | | Merge branch '44596-double-title-merge-request-message' into 'master'Grzegorz Bizon2018-09-171-1/+6
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix double title in merge request chat messages Closes #44586 See merge request gitlab-org/gitlab-ce!21670
| * | | | | | Add fix for EE merge messageKukovskii Vladimir2018-09-141-1/+6
| | | | | | |
| * | | | | | Fix double title in merge request chat messagesKukovskii Vladimir2018-09-111-1/+1
| | | | | | |
* | | | | | | Resolve "Unable to import repository: undefined method `import_file' for ↵James Lopez2018-09-172-3/+7
| |/ / / / / |/| | | | | | | | | | | | | | | | | nil:NilClass"
* | | | | | Fix grammar (setup to set-up) in code comments, spec, views, etc.Marcel Amirault2018-09-1713-18/+18
| |/ / / / |/| | | |
* | | | | Merge branch '50461-add-retried-builds-in-pipeline-stage-endpoint' into 'master'Kamil Trzciński2018-09-172-1/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add retried jobs to pipeline stages Closes #50461 See merge request gitlab-org/gitlab-ce!21558
| * | | | | Add retried jobs to pipeline stagesSteve Azzopardi2018-09-132-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50461
* | | | | | Merge branch '50460-send-deployment-information-in-job-api' into 'master'Kamil Trzciński2018-09-172-0/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Send deployment information in job API" Closes #50460 See merge request gitlab-org/gitlab-ce!21307
| * | | | | | Add deployment information in job APISteve Azzopardi2018-09-132-0/+37
| |/ / / / / | | | | | | | | | | | | | | | | | | closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50460
* | | | | | Merge branch '29398-support-rbac-for-gitlab-provisioned-clusters' into 'master'Kamil Trzciński2018-09-1710-79/+167
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support Kubernetes RBAC for GitLab Managed Apps for creating new clusters Closes #29398 See merge request gitlab-org/gitlab-ce!21401
| * | | | | | Kubernetes secret are namespaced, so must always pass a namespace arg.Thong Kuah2018-09-143-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In our case it's 'default'.
| * | | | | | Add FE option for users to choose to create a fully RBAC-enabled cluster or not.Thong Kuah2018-09-144-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is similar to the option in the Add Existing cluster form
| * | | | | | Always create `gitlab` service account and service account token regardless ↵Thong Kuah2018-09-144-32/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of ABAC/RBAC This also solves the async nature of the automatic creation of default service tokens for service accounts. It also makes explicit which service account token we always use. create cluster role binding only if the provider has legacy_abac disabled.
| * | | | | | Drive creation of a rbac platform_kubernetes off provider#legacy_abac so ↵Thong Kuah2018-09-141-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | that there is one single source of truth.
View Lorry Controller Status