summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix escaping in addMultipleToDiscussionWarningvue-i18n-js-vue-shared-directoryEzekiel Kigbo2019-07-064-3/+4
| | | | Replace backticks with single quotes
* Clean up autofixed translationsEzekiel Kigbo2019-07-0617-56/+53
| | | | | | | Replace backticks with single quotes Add additional translations Fix ESLint warnings Fixed - prettier updates
* Fix missing `__` importsEzekiel Kigbo2019-07-0612-7/+16
| | | | | | | | | | | Some `__` imports were not automatically added during the i18n autofix of these files. Removed potential false positives Potential false postives that we do not want to lint have been removed and logged in a separate issue
* Vue-i18n: app/assets/javascripts/vue_shared directoryEzekiel Kigbo2019-07-0624-48/+123
| | | | | i18n linting for .vue files under the app/assets/javascripts/vue_shared directory
* Merge branch 'winh-notes-service-applySuggestion' into 'master'Fatih Acet2019-07-054-10/+11
|\ | | | | | | | | Remove applySuggestion from notes service See merge request gitlab-org/gitlab-ce!30399
| * Remove applySuggestion from notes serviceWinnie Hellmann2019-07-054-10/+11
|/
* Merge branch '64176-fix-error-handling' into 'master'Mayra Cabrera2019-07-054-5/+19
|\ | | | | | | | | Fix invalid SSL certificate errors on Drone CI service See merge request gitlab-org/gitlab-ce!30422
| * Add OpenSSL::OpenSSLError to HTTP_ERRORSDouglas Barbosa Alexandre2019-07-054-5/+19
|/ | | | | | Some services can raise OpenSSL::X509::CertificateError due to an invalid SSL certificates, with OpenSSL::OpenSSLError we can handle these errors.
* Merge branch 'dm-queue-mirror-jobs-in-batches-drain-ce' into 'master'Bob Van Landuyt2019-07-051-0/+6
|\ | | | | | | | | Add queue_size method to ApplicationWorker See merge request gitlab-org/gitlab-ce!30416
| * Add queue_size method to ApplicationWorkerdm-queue-mirror-jobs-in-batches-drain-ceDouwe Maan2019-07-051-0/+6
| |
* | Merge branch 'docs/edit-job-artifacts-text' into 'master'Achilleas Pipinellis2019-07-051-4/+7
|\ \ | | | | | | | | | | | | Edit text, using correct terms See merge request gitlab-org/gitlab-ce!30382
| * | Edit text, using correct termsEvan Read2019-07-051-4/+7
|/ /
* | Merge branch 'update-license-management-docs' into 'master'Achilleas Pipinellis2019-07-051-2/+9
|\ \ | | | | | | | | | | | | Added experimental languages to license management docs. See merge request gitlab-org/gitlab-ce!29932
| * | Added experimental languages to license management docs.Zachary Knight2019-07-051-2/+9
|/ /
* | Merge branch 'qa-fix-issue-resource' into 'master'Walmyr2019-07-051-1/+5
|\ \ | | | | | | | | | | | | Fix failing e2e tests - initialize Issue labels See merge request gitlab-org/gitlab-ce!30375
| * | Initialize Issue labelsqa-fix-issue-resourceMark Lapierre2019-07-051-1/+5
| | | | | | | | | | | | | | | This provides a valid default value when labels are not specified explicitly.
* | | Merge branch '63976-discussion-sticky-header' into 'master'Phil Hughes2019-07-051-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Fix top position of sticky file header on discussion tab Closes #63976 See merge request gitlab-org/gitlab-ce!30410
| * | Fix top position of sticky file header on discussion tabAnnabel Dunstone Gray2019-07-051-1/+1
| | |
* | | Merge branch 'docs/edit-gitlab-com-visibility-text' into 'master'Achilleas Pipinellis2019-07-051-9/+7
|\ \ \ | | | | | | | | | | | | | | | | Edit new text on visibility setting See merge request gitlab-org/gitlab-ce!30281
| * | | Edit new text on visibility settingEvan Read2019-07-051-9/+7
|/ / /
* | | Merge branch 'fix_document_for_install_from_source-docs' into 'master'Achilleas Pipinellis2019-07-051-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Documentation: Update installation from source document See merge request gitlab-org/gitlab-ce!30380
| * | | Update installation.mdKyohei Uemura2019-07-051-3/+3
|/ / / | | | | | | | | | | | | Line 170(make install) causes permission error. This command should execute with sudo.
* | | Merge branch 'issue-61565' into 'master'Annabel Dunstone Gray2019-07-053-19/+13
|\ \ \ | | | | | | | | | | | | | | | | Remove unresolved class and fixed height in discussion header See merge request gitlab-org/gitlab-ce!28440
| * | | Remove unresolved class and fixed height in discussion headerDavid Palubin2019-07-053-19/+13
|/ / /
* | | Merge branch 'docs-its-relative-8' into 'master'Achilleas Pipinellis2019-07-0518-43/+43
|\ \ \ | | | | | | | | | | | | | | | | Docs: Change even more absolute links to relative See merge request gitlab-org/gitlab-ce!30387
| * | | Change absolute links to relativeMarcel Amirault2019-07-0518-43/+43
|/ / / | | | | | | | | | | | | Change assorted absolute links to ce and ee docs to relative links
* | | Merge branch '12550-fullscrean' into 'master'Phil Hughes2019-07-052-0/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for app/views/layouts/fullscreen.html.haml Closes gitlab-ee#12550 See merge request gitlab-org/gitlab-ce!30403
| * | | Removes EE differences12550-fullscreanFilipa Lacerda2019-07-052-0/+7
| | | |
* | | | Merge branch '51794-add-ordering-to-runner-jobs-api' into 'master'Lin Jen-Shin2019-07-056-1/+93
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding order by to list runner jobs api. Closes #51794 See merge request gitlab-org/gitlab-ce!29629
| * \ \ \ Updating branch, and minor dix.sujay2019-07-050-0/+0
| |\ \ \ \
| | * \ \ \ Resolving conflicts.sujay2019-07-036-35/+63
| | |\ \ \ \
| | | * | | | Adding order by to list runner jobs api.sujay patel2019-06-226-1/+93
| | | | | | |
| | * | | | | Adding order by to list runner jobs api.sujay patel2019-07-034-1/+65
| | | | | | |
| * | | | | | Adding order by to list runner jobs api.sujay patel2019-07-056-35/+63
| | | | | | |
| * | | | | | Adding order by to list runner jobs api.sujay patel2019-07-054-1/+65
| | | | | | |
* | | | | | | Merge branch 'ce-10283-notifications-for-ci-minutes-quota-limit-approaching' ↵James Lopez2019-07-052-0/+10
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14328 See merge request gitlab-org/gitlab-ce!30003
| * | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14328ce-10283-notifications-for-ci-minutes-quota-limit-approachingRubén Dávila2019-07-052-0/+10
| | | | | | |
* | | | | | | Merge branch 'zj-remove-stale-feature-flag-keys' into 'master'Andreas Brandl2019-07-052-1/+49
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused Gitaly feature flags See merge request gitlab-org/gitlab-ce!30302
| * | | | | | | Remove unused Gitaly feature flagsZeger-Jan van de Weg2019-07-042-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When GitLab was migrating to Gitaly, feature flags were used. These are now out of use, and essentially a no-op. But they do make the output of chatops ugly and the feature table is selected in full by the application.
* | | | | | | | Merge branch 'create-merge-train-ref-ce' into 'master'Douwe Maan2019-07-0511-26/+85
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Port: Extend `MergeToRefService` to create merge ref from an arbitrary ref See merge request gitlab-org/gitlab-ce!30361
| * | | | | | | | Extend MergeToRefService for creating merge ref from the other refShinya Maeda2019-07-0511-26/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, MergeToRefService is specifically designed for createing merge commits from source branch and target branch of merge reqeusts. We extend this behavior to source branch and any target ref paths.
* | | | | | | | | Merge branch 'make-explicit-endpoint-abort-in-auto-merge-ce' into 'master'Kamil Trzciński2019-07-0512-15/+129
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Port: Split AutoMergeService interfaces into two `cancel` and `abort` See merge request gitlab-org/gitlab-ce!30249
| * | | | | | | | | Split AutoMergeService interfaces into two `cancel` and `abort`make-explicit-endpoint-abort-in-auto-merge-ceShinya Maeda2019-07-0512-15/+129
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Create explicit endpoint - abort.
* | | | | | | | | Merge branch 'fetch-forked-projects-create-mr' into 'master'Filipa Lacerda2019-07-0516-15/+599
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create private merge requests in forks Closes #58583 See merge request gitlab-org/gitlab-ce!29984
| * | | | | | | | | Create private merge requests in forksPhil Hughes2019-07-0516-15/+599
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/58583
* | | | | | | | | | Merge branch 'ce-12464-remove-gitpushservice' into 'master'Lin Jen-Shin2019-07-051-5/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix call to removed GitPushService See merge request gitlab-org/gitlab-ce!30222
| * | | | | | | | | | Fix call to removed GitPushServicece-12464-remove-gitpushserviceMarkus Koller2019-07-041-5/+7
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '12553-preferences' into 'master'Phil Hughes2019-07-052-6/+11
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for app/views/profiles/preferences/show.html.haml Closes gitlab-ee#12553 See merge request gitlab-org/gitlab-ce!30397
| * | | | | | | | | | Removes EE differencesFilipa Lacerda2019-07-052-6/+11
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix-divergence-graph-error' into 'master'Filipa Lacerda2019-07-052-3/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix divergence graph loading error Closes #64143 See merge request gitlab-org/gitlab-ce!30393