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
AgeCommit message (Collapse)Author
2018-06-08Users can accept terms during registrationBob Van Landuyt
When a user checks the `accept` checkbox, we will track that acceptance as usual. That way they don't need to accept again after they complete the registration. When an unauthenticated user visits the `/-/users/terms` page, there is no button to accept, decline or continue. The 'current-user menu' is also hidden from the top bar.
2018-06-07Backport of "Add assignee lists to boards"Mario de la Ossa
2018-06-07Merge branch '46648-timeout-searching-group-issues' into 'master'Grzegorz Bizon
Resolve "Timeout searching group issues" Closes #46648 See merge request gitlab-org/gitlab-ce!19429
2018-06-07Merge remote-tracking branch 'origin/master' into ↵Kamil Trzciński
38542-application-control-panel-in-settings-page
2018-06-07Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan
Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497
2018-06-07Merge branch 'ccr/extract_EE_code_5942' into 'master'Sean McGivern
Backport of 5942-extract-ee-specific-files See merge request gitlab-org/gitlab-ce!19285
2018-06-07Merge branch 'dz-fix-cluster-oauth' into 'master'Dmitriy Zaporozhets
Pass request to oauth creation during cluster app install Closes #47459 See merge request gitlab-org/gitlab-ce!19522
2018-06-07Merge branch '39549-label-list-page-redesign-with-draggable-labels' into ↵Tim Zallmann
'master' Resolve "Label list page redesign with draggable labels" Closes #39549 See merge request gitlab-org/gitlab-ce!18466
2018-06-07Pass request to oauth creation during cluster app installDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-06-07Force Postgres to avoid trigram indexes when in a groupSean McGivern
When filtering issues with a search string in a group, we observed on GitLab.com that Postgres was using an inefficient query plan, preferring the (global) trigram indexes on description and title, rather than using a filter on the restricted set of issues within the group. Change the callers of the IssuableFinder to use a CTE in this case to fence the rest of the query from the LIKE filters, so that the optimiser is forced to perform the filter in the order we prefer. This will only force the use of a CTE when: 1. The use_cte_for_search params is truthy. 2. We are using Postgres. 3. We have passed the `search` param. The third item is important - searching issues using the search box does not use the finder in this way, but contructs a query and appends `full_search` to that. For some reason, this query does not suffer from the same issue. Currenly, we only pass this param when filtering issuables (issues or MRs) in a group context.
2018-06-07Merge branch 'master' into ↵Luke Bennett
'39549-label-list-page-redesign-with-draggable-labels' # Conflicts: # app/views/projects/labels/index.html.haml
2018-06-06Log response body to production_json.log when a controller responds with a ↵Stan Hu
422 status We have a number of import errors occurring with 422 errors, and it's hard to determine why they are happening. This change will surface the errors in the log lines. Relates to #47365
2018-06-06Merge branch 'master' into 38542-application-control-panel-in-settings-pageMatija Čupić
2018-06-06Merge branch 'sh-improve-import-status-error' into 'master'Fatih Acet
Show a more helpful error for import status Closes #47365 See merge request gitlab-org/gitlab-ce!19467
2018-06-06Simplify issuable finder queriesSean McGivern
We had `item_project_ids` to help make slow queries on the dashboard faster, but this isn't necessary any more - the queries are plenty fast, and we forbid searching the dashboard without filters.
2018-06-06add deploy strategy radio buttonsMike Greiling
2018-06-06Merge branch 'bvl-graphql-start-34754' into 'master'Douwe Maan
GraphQL setup: Basic Project and Merge request endpoint Closes #34754 See merge request gitlab-org/gitlab-ce!19008
2018-06-06Simplify error message handling in Projects::CreateServiceStan Hu
There's no need to add a redundant message to the errors if the model is invalid. This cleans up the message as well for the importer.
2018-06-06Show a more helpful error for import statusStan Hu
Importing a project from GitHub for a project namespace that already exists would show an unhelpful error, "An error occurred while importing project." We now add the base message from Projects::CreateService when this fails. Closes #47365
2018-06-06Merge branch ↵Grzegorz Bizon
'47196-actionview-missingtemplate-missing-template-projects-merge_requests-invalid-projects-merge_requests-application-invalid-pr' into 'master' Resolve "ActionView::MissingTemplate: Missing template projects/merge_requests/invalid, projects/merge_requests/application/invalid, pr..." Closes #47196 See merge request gitlab-org/gitlab-ce!19356
2018-06-06Merge remote-tracking branch 'origin/master' into ↵Luke Bennett
39549-label-list-page-redesign-with-draggable-labels
2018-06-06Merge branch '5941-extract-ee-controllers' into 'master'Rémy Coutable
Backport of "Extract EE specific files/lines for app/controllers/groups" See merge request gitlab-org/gitlab-ce!19343
2018-06-06Render 'invalid' if #target_branch_missing?Ash McKenzie
2018-06-06Rename #check_if_can_be_merged -> #mark_merge_request_mergeableAsh McKenzie
2018-06-06Rename #close_merge_request_without_source_projectAsh McKenzie
#close_merge_request_without_source_project -> close_merge_request_if_no_source_project
2018-06-05Handle exceptions outside the GraphQL schemaBob Van Landuyt
This allows us to report JSON parse exceptions to clients and ignore them in sentry.
2018-06-05Add a minimal GraphQL APINick Thomas
2018-06-05Merge branch 'master' into ↵Kamil Trzciński
'backstage/gb/use-persisted-stages-to-improve-pipelines-table' # Conflicts: # db/schema.rb
2018-06-05Merge branch '46585-gdpr-terms-acceptance' into 'master'Robert Speicher
Resolve "Missing Accept button for terms of service" Closes #46585 See merge request gitlab-org/gitlab-ce!19156
2018-06-05Merge branch 'bvl-403-for-external-auth-service-ce' into 'master'Douwe Maan
[CE-backbport] Render a 403 when showing an access denied message See merge request gitlab-org/gitlab-ce!19415
2018-06-05Merge branch '42751-rename-mr-maintainer-push' into 'master'Robert Speicher
Rephrase Merge Request Maintainer Edit See merge request gitlab-org/gitlab-ce!19061
2018-06-05simplify uploader versions checkAlexis Reigel
2018-06-05require uploaded file's name to match in any caseAlexis Reigel
2018-06-05ability to get an image's alternative versionAlexis Reigel
2018-06-05allow uploading favicon in appearance settingsAlexis Reigel
2018-06-05Merge branch 'master' into ↵Grzegorz Bizon
'backstage/gb/use-persisted-stages-to-improve-pipelines-table' # Conflicts: # db/schema.rb
2018-06-05Merge remote-tracking branch 'origin/master' into ↵Luke Bennett
39549-label-list-page-redesign-with-draggable-labels
2018-06-05Merge branch 'presigned-multipart-uploads' into 'master'Grzegorz Bizon
Support presigned multipart uploads See merge request gitlab-org/gitlab-ce!18855
2018-06-05Render a 403 when showing an access denied messageBob Van Landuyt
When we want to show an access denied message to a user, we don't have to hide the resource's existence. So in that case we render a 403, this 403 is not handled by nginx on omnibus installs, making sure the message is visible to the user.
2018-06-05Merge branch 'master' into ↵Grzegorz Bizon
'backstage/gb/use-persisted-stages-to-improve-pipelines-table' Conflicts: app/models/ci/pipeline.rb
2018-06-05Merge branch '36862-subgroup-milestones' into 'master'Sean McGivern
Include all ancestors milestones in json list & autocomplete Closes #36862 See merge request gitlab-org/gitlab-ce!19317
2018-06-04Messaging on terms page when user already acceptedtauriedavis
We show a blue flash banner if the user already accepted, and show a button allowing them to continue to the application.
2018-06-04Backport changes to app/controllers/groups/milestones_controller.rbMario de la Ossa
2018-06-04Backport changes to app/controllers/groups/group_members_controller.rbMario de la Ossa
2018-06-04Include all ancestors milestones in json list & autocompleteJarka Kadlecová
2018-06-04Hide archived projects from `shared_projects`Bob Van Landuyt
Since we don't show the archived projects, we shouldnot load them and pass them to the fronted to be filtered out again.
2018-06-04Support presigned multipart uploadsKamil Trzciński
2018-06-01Backport of 5942-extract-ee-specific-filesChantal Rollison
2018-06-01Merge branch '46010-add-more-validations-for-runners-and-runner-type' into ↵Kamil Trzciński
'master' Improve validations for Ci::Runner#runner_type See merge request gitlab-org/gitlab-ce!18901
2018-06-01Add validation to webhook and service URLs to ensure they are not blocked ↵Francisco Javier López
because of SSRF