Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2018-09-19Enable frozen string in app/controllers/**/*.rbgfyoung
Enables frozen string for the following: * app/controllers/*.rb * app/controllers/admin/**/*.rb * app/controllers/boards/**/*.rb * app/controllers/ci/**/*.rb * app/controllers/concerns/**/*.rb Partially addresses #47424.
2018-09-18Merge branch 'remove-ee-specific-lines-from-plan-concerns' into 'master'Robert Speicher
Remove EE-specific lines from Plan concerns See merge request gitlab-org/gitlab-ce!21448
2018-09-18[QA] consolidate selector patterns (1_manage/login)Dan Davison
2018-09-18Improve cluster apps installation flowMike Greiling
2018-09-18Improve TabHelper to clarify the use of Namespaces for the nav_linkGabriel Mazetto
2018-09-18Merge branch '51546-rails5-milestone-groups' into 'master'Yorick Peterse
Don't use MilestoneFinder for group milestones Closes #51546 See merge request gitlab-org/gitlab-ce!21780
2018-09-18Resolve "Move filter dropdown from Font Awesome to our own icons"Constance Okoghenun
2018-09-18Don't use MilestoneFinder for group milestonesDouglas Barbosa Alexandre
This refactors the DashboardGroupMilestone model so that it no longer uses the MilestoneFinder, instead using methods defined on the Milestone model directly.
2018-09-18Merge branch '51564-fix-commit-email-usage' into 'master'Douwe Maan
Respect the user commit email in more places Closes #51564 See merge request gitlab-org/gitlab-ce!21773
2018-09-18Guard against regressions in commit email specsNick Thomas
2018-09-18Merge branch ↵Douwe Maan
'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
2018-09-18Expose runners status information in job apiSteve Azzopardi
2018-09-18Merge branch 'sh-fix-commit-email-migration' into 'master'Nick Thomas
Return a default commit email if migration has not completed Closes #51530 See merge request gitlab-org/gitlab-ce!21790
2018-09-18Merge branch 'ml-qa-spec-use-ssh-key' into 'master'Robert Speicher
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
2018-09-18Fix haml-lint error in 2FA codes partialRobert Speicher
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51585
2018-09-17Merge branch 'fix-url-validator' into 'master'Douglas Barbosa Alexandre
Allow UrlValidator to work with attr_encrypted See merge request gitlab-org/gitlab-ce!21776
2018-09-17Allow UrlValidator to work with attr_encryptedNick Thomas
2018-09-17Merge branch 'select-from-union' into 'master'Robert Speicher
Replace direct use of Gitlab::SQL::Union with a "from_union" method Closes #51307 See merge request gitlab-org/gitlab-ce!21672
2018-09-17Filter out archived projects from issue/mr countBrett Walker
Pass the 'non_archived' flag to finder methods
2018-09-17Merge branch 'decouple-file-row-from-ide' into 'master'Filipa Lacerda
Decouple file row from IDE See merge request gitlab-org/gitlab-ce!21742
2018-09-17Add 2fa buttonLuke Picciau
2018-09-17Merge branch '51093-add-runner-json-schema-and-factory' into 'master'Kamil Trzciński
Resolve "Add runner JSON schema" Closes #51093 See merge request gitlab-org/gitlab-ce!21525
2018-09-17Use commit email for wiki actionsNick Thomas
2018-09-17Use the correct email address when committing via a file serviceNick Thomas
2018-09-17Backport EE changes to ↵Lukas Eipert
`app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js`
2018-09-17Merge branch '50956-web-terminal' into 'master'Phil Hughes
Include correct CSS file for xterm in environments page Closes #50956 See merge request gitlab-org/gitlab-ce!21768
2018-09-17Fix bad conflicts resolutionLin Jen-Shin
2018-09-17Remove EE-specific code from ProtectedRefAccessSean McGivern
2018-09-17Remove EE-specific code from MentionableSean McGivern
2018-09-17Remove EE-specific code from IssuableSean McGivern
2018-09-17Merge branch '44596-double-title-merge-request-message' into 'master'Grzegorz Bizon
Fix double title in merge request chat messages Closes #44586 See merge request gitlab-org/gitlab-ce!21670
2018-09-17Decouple file row from IDEPhil Hughes
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
2018-09-17Include correct CSS file for xterm in environments pageFilipa Lacerda
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.
2018-09-17Resolve "Unable to import repository: undefined method `import_file' for ↵James Lopez
nil:NilClass"
2018-09-17Added FromUnion to easily select from a UNIONYorick Peterse
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
2018-09-17Fix grammar (setup to set-up) in code comments, spec, views, etc.Marcel Amirault
2018-09-17Add runner JSON schemaSteve Azzopardi
closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51093
2018-09-17Merge branch '50461-add-retried-builds-in-pipeline-stage-endpoint' into 'master'Kamil Trzciński
Add retried jobs to pipeline stages Closes #50461 See merge request gitlab-org/gitlab-ce!21558
2018-09-17Merge branch '50460-send-deployment-information-in-job-api' into 'master'Kamil Trzciński
Resolve "Send deployment information in job API" Closes #50460 See merge request gitlab-org/gitlab-ce!21307
2018-09-17Merge branch '29398-support-rbac-for-gitlab-provisioned-clusters' into 'master'Kamil Trzciński
Support Kubernetes RBAC for GitLab Managed Apps for creating new clusters Closes #29398 See merge request gitlab-org/gitlab-ce!21401
2018-09-17Merge branch 'mr-widget-discussion-state-fix' into 'master'Filipa Lacerda
Fixed MR widget unresolved discussions state See merge request gitlab-org/gitlab-ce!21705
2018-09-17Merge branch 'rs-due-date-autocomplete' into 'master'Phil Hughes
Disable autocomplete for issuable due date field See merge request gitlab-org/gitlab-ce!21751
2018-09-16Return a default commit email if migration has not completedStan Hu
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51530
2018-09-15Add an SSH key and use it to clone and pushMark Lapierre
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
2018-09-15Filter out archived issues from group issue boardBrett Walker
2018-09-14Merge branch '50824-fix-prepend-concern' into 'master'Robert Speicher
CE: Properly implement prepending for Concern See merge request gitlab-org/gitlab-ce!21444
2018-09-14Disable autocomplete for issuable due date fieldRobert Speicher
2018-09-14Merge branch 'fix-rubocop-master-failures' into 'master'Robert Speicher
Cleaned up CI runner administration code See merge request gitlab-org/gitlab-ce!21741
2018-09-14Resolve "Username alignment issue on MR page"Martin Wortschack
2018-09-14Cleaned up CI runner administration codeYorick Peterse
In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19625 some changes were introduced that do not meet our abstraction reuse rules. This commit cleans up some of these changes so the requirements are met. Most notably, sorting of the runners in Admin::RunnersFinder has been delegated to Ci::Runner.order_by, similar to how we order data in models that include the Sortable module. If we need more sort orders in the future we can include Sortable and have Ci::Runner.order_by call `super` to delegate to Sortable.order_by.