summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sh-update-openid-omniauth-gem' into 'master'Douglas Barbosa Alexandre2019-06-121-6/+0
|\ | | | | | | | | Bump omniauth_openid_connect to 0.3.1 See merge request gitlab-org/gitlab-ce!29387
| * Bump omniauth_openid_connect to 0.3.1sh-update-openid-omniauth-gemStan Hu2019-06-081-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/issues/62208, users were seeing 404 errors when they configured their OpenID provider without a name parameter since OmniAuth would use the name `openidconnect` instead `openid_connect`. https://github.com/m0n9oose/omniauth_openid_connect/pull/23 makes the default parameter `openid_connect` so this additional initializer in GitLab is not necessary. Plus, this change enables users to use multiple OpenID Connect providers if they desire.
* | Merge branch 'rack-timeout-rename' into 'master'Bob Van Landuyt2019-06-122-46/+51
|\ \ | | | | | | | | | | | | Moved RackTimeout observer to a different location and ignore transition states See merge request gitlab-org/gitlab-ce!29214
| * | Monitor only final statesrack-timeout-renameJan Provaznik2019-06-121-1/+4
| | | | | | | | | | | | | | | | | | There is no reason to monitor transition states so we ignore ready and active states. We can get ratio of completed vs failed requests from final states.
| * | Moved RackTimeout observer to a different locationJan Provaznik2019-06-122-46/+48
| | | | | | | | | | | | | | | Because there will be similar observer for PumaWorkerKiller, it makes sense to keep both on better place.
* | | Merge branch 'expose-project-git-depth-via-api' into 'master'Kamil Trzciński2019-06-122-0/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Expose default_git_depth via project API Closes #62908 See merge request gitlab-org/gitlab-ce!29353
| * | Expose ci_default_git_depth via project APIexpose-project-git-depth-via-apiFabio Pitino2019-06-122-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Get and Update of ci_default_git_depth for Project API. Renaming Project#default_git_depth to :ci_default_git_depth to give more context through the API usage. Add API documentation
* | | Merge branch 'bvl-rename-loader-for-lfs-oids' into 'master'Jan Provaznik2019-06-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Rename `BatchCommitLoader` to `BatchLfsOidLoader` See merge request gitlab-org/gitlab-ce!29487
| * | | Rename `BatchCommitLoader` to `BatchLfsOidLoader`Bob Van Landuyt2019-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | Since we're not actually loading commits in that loader, but we're loading blobs with LFS oids in batch and returning only the oids.
* | | | Update Serverless.gitlab-ci-yml to fix lint warningMarcel Amirault2019-06-121-1/+1
| | | |
* | | | API issues - minor cleanup of permission checkJan Provaznik2019-06-111-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | Adds `set_issue_updated_at` similar to `set_issue_created_at` permission and cleans up the related permission check in issues API.
* | | | Revert "Automatically update MR merge-ref along merge status"Oswaldo Ferreira2019-06-112-7/+19
|/ / /
* | | Merge branch 'ignore-artifact-attirbutes-in-project-import-export' into 'master'James Lopez2019-06-112-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ignore legacy artifact columns in Project Import/Export Closes #63033 See merge request gitlab-org/gitlab-ce!29427
| * | | Ignore legacy artifact columns in Project Import/ExportShinya Maeda2019-06-112-0/+6
| | | | | | | | | | | | | | | | Ignore some columns
* | | | Merge branch 'prom-api-1' into 'master'Sean McGivern2019-06-114-6/+51
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update server API to enable switch prometheus endpoint See merge request gitlab-org/gitlab-ce!29186
| * | | | Switch errors to inherit from a base classprom-api-1syasonik2019-06-063-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error classes associated with individual stages of dashboard processing tend to have very long names. As dashboard post-processing includes more steps, we will likely need to handle more error cases. Refactoring to have all errors inherit from a specific base class will help accommodate this and keep the code more readable.
| * | | | Address rubocop errorssyasonik2019-06-061-2/+1
| | | | |
| * | | | Expose prometheus endpoint per metric in dashboardsyasonik2019-06-063-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a new stage to dashboard processesing step for the EnvironmentsController::metrics_dashboard endpoint. Allows the front end to avoid generating the endpoint unitutive string mutations.
* | | | | Merge branch 'add-lfs-blob-ids-to-tree-type' into 'master'Filipa Lacerda2019-06-111-0/+25
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Add LFS blob IDs to GraphQL tree type See merge request gitlab-org/gitlab-ce!28666
| * | | | Add LFS blob ID to GraphQL blob typePhil Hughes2019-06-101-0/+25
| | |/ / | |/| |
* | | | Merge branch 'sh-fix-utf-8-encoding-resolve-conflicts' into 'master'Dmitriy Zaporozhets2019-06-111-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix UTF-8 conversion issues when resolving conflicts Closes #63062 See merge request gitlab-org/gitlab-ce!29453
| * | | | Force source and target branch to binary modesh-fix-utf-8-encoding-resolve-conflictsStan Hu2019-06-101-2/+2
| | | | |
| * | | | Fix UTF-8 conversion issues when resolving conflictsStan Hu2019-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/63030, when the commit message in the /resolve_conflicts endpoint contains a UTF-8 character, the conversion to the Gitaly ASCII-8BIT value may flag an error. To fix this, we run `force_encoding` on the commit message. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63062
* | | | | Merge branch 'allow-emoji-in-references' into 'master'Robert Speicher2019-06-101-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow references to labels and milestones to contain emoji Closes #37762, #53756, and #40728 See merge request gitlab-org/gitlab-ce!29284
| * | | | | Allow emoji in label and milestone referencesallow-emoji-in-referencesSean McGivern2019-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we put the emoji filter before the reference filters, each emoji will have a wrapper element that prevents the reference filter from detecting the presence of the emoji. As the emoji filter now runs after the reference filters, references must contain a literal emoji, not the GitLab Flavored Markdown versions (:100`, for example). A weird side-effect is that if you have a label with the 100 emoji, and a label named :100:, then trying to reference the latter will work (link to the correct label), but will render with the 100 emoji. I'm comfortable with that edge case, I think.
* | | | | | Avoid encoding errors for MergeToRefServiceosw-avoid-encoding-errors-on-merge-to-ref-serviceOswaldo Ferreira2019-06-101-1/+1
| | | | | |
* | | | | | Add metric for measuring PumaWorkerKiller activityJan Provaznik2019-06-102-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PumaWorkerKiller is used for periodically checking and killing workers (the biggest one) if overall memory reaches specified limit. This metric allows us to watch number of killed workers.
* | | | | | Merge branch '33064-add-labels-to-note-event-payload' into 'master'Sean McGivern2019-06-102-1/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding labels to note event payload. Closes #33064 See merge request gitlab-org/gitlab-ce!29384
| * | | | | Adding labels to note event payload.Sujay Patel2019-06-102-1/+3
| | | | | |
* | | | | | Add backtraces to Peek performance bar for SQL callssh-add-backtrace-to-sql-queriesStan Hu2019-06-091-3/+4
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just as we have backtraces for Gitaly, we should also have backtraces for SQL calls. This makes it much easier to find the source of the SQL call and optimize N+1 queries and other performance issues with an endpoint.
* | | | | Revert "Merge branch '50070-legacy-attachments' into 'master'"sh-revert-mr-24679Stan Hu2019-06-091-128/+0
| |_|_|/ |/| | | | | | | | | | | | | | | This reverts commit fd19f887dfeeeedb483c4a4fb32f9f768e89389c, reversing changes made to abb2d4c601d796339c8d7cb0c00946696730f198.
* | | | Show description of 'gettext:regenerate' taskbw-gettext-rake-taskBrett Walker2019-06-071-0/+1
| | | |
* | | | Merge branch '51636-task-list-api-pderichs' into 'master'Sean McGivern2019-06-071-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add task count and completed count to responses of Issue and MR See merge request gitlab-org/gitlab-ce!28859
| * | | | Add task count and completed count to responses of Issue and MRPatrick Derichs2019-06-071-0/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spec for task_completion_status Add test cases for task_completion_status result Extracted shared samples Add new spec file for task completion status response Fix style errors Add changelog entry Changed samples to Hashes Remove test for successful request Remove not nil expectation Add task_completion_status to api documentation for issues Add task_completion_status to api documentation for merge_requests Refactor spec so it just requests one specific item Add task_completion_status to Taskable Simplified task completion status in entities Refactor spec so it separates status code check and content check Fix spec description text and field name
* | | | Merge branch '58297-remove-extraneous-gitaly-calls-from-md-rendering' into ↵Dmitriy Zaporozhets2019-06-071-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove extraneous DiffNote#supports_suggestion? calls See merge request gitlab-org/gitlab-ce!29027
| * | | | Extend #parse to accept a suggestions_filter_enabled paramKerri Miller2019-06-051-2/+4
| | | | | | | | | | | | | | | | | | | | This will allow the front end to specify the behavior as needed.
* | | | | Merge branch '50070-legacy-attachments' into 'master'Kamil Trzciński2019-06-071-0/+128
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Migrate legacy uploads Closes #57217 See merge request gitlab-org/gitlab-ce!24679
| * | | | Migrate legacy uploads to the project location50070-legacy-attachmentsJarka Košanová2019-06-061-0/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uploads coming from AttachmentUploader need to be moved to the currently supported location (FileUploader)
* | | | | Merge branch 'sh-fix-openid-connect-defaults' into 'master'Ash McKenzie2019-06-071-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make OpenID Connect work without requiring a name Closes #62208 See merge request gitlab-org/gitlab-ce!29312
| * | | | | Make OpenID Connect work without requiring a namesh-fix-openid-connect-defaultsStan Hu2019-06-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no name argument given, OmniAuth will try to guess the name by the class name. In https://github.com/omniauth/omniauth/blob/v1.9.0/lib/omniauth/strategy.rb#L139, `OmniAuth::Strategies::OpenIDConnect` gets translated to `openidconnect`. This leads to an immediate 404 error after clicking the login button because OmniAuth can't match the current route (/users/auth/openid_connect) against the expected one (/users/auth/openidconnect). Other providers, such as Google OAuth2, set this name as the default option within the OmniAuth Strategy. Until a fix is merged upstream, let's just set the parameter ourselves. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62208
* | | | | | Adds sidekiq worker label for ruby metricsRyan Cobb2019-06-061-1/+1
|/ / / / /
* | | | | Add certificate valid time to pages domain tableVladimir Shushlin2019-06-061-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | Save certificate validity time for pages domains on save Fill validity time for existing pages domains in background migration
* | | | | Add pages domains acme ordersVladimir Shushlin2019-06-062-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract acme double to helper Create ACME challanges for pages domains * Create order & challange through API * save them to database * request challenge validation We're saving order and challenge as one entity, that wouldn't be correct if we would order certificates for several domains simultaneously, but we always order certificate per domain Add controller for processing acme challenges redirected from pages Don't save acme challenge url - we don't use it Validate acme challenge attributes Encrypt private_key in acme orders
* | | | | Merge branch ↵Dmitriy Zaporozhets2019-06-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '62847-url-for-the-next-request-with-pagination-is-missing-port' into 'master' Resolve "Url for the next request with pagination is missing port" Closes #62847 See merge request gitlab-org/gitlab-ce!29267
| * | | | | Include the port in the URLs of the API Link headersRémy Coutable2019-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch '62015-add-counterpart-tae-to-the-reviewer-roulette' into 'master'Sean McGivern2019-06-062-8/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add counterpart TAE to the reviewer roulette" Closes #62015 See merge request gitlab-org/gitlab-ce!28678
| * | | | | | Show Test Automation Engineer for spec/feature asLin Jen-Shin2019-06-062-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | reviewers.
* | | | | | | Only use Gitaly catfile_cache_size=5 in testJacob Vosmaer2019-06-061-1/+7
| | | | | | |
* | | | | | | Revert "Merge branch 'pages-domain_ssl-valid-period' into 'master'"revert-a05f86ceNick Thomas2019-06-061-32/+0
| |_|/ / / / |/| | | | | | | | | | | This reverts merge request !28743
* | | | | | Add certificate valid time to pages domain tableVladimir Shushlin2019-06-061-0/+32
|/ / / / / | | | | | | | | | | | | | | | | | | | | Save certificate validity time for pages domains on save Fill validity time for existing pages domains in background migration