summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Use existing classes for display inline contentPatrick Bajao2019-04-022-14/+8
| | | | | | | | | | |
| * | | | | | | | | | Update GITALY_SERVER_VERSION to masterPatrick Bajao2019-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gitaly branch has been merged to master and deleted so need to use master for now until a release gets out.
| * | | | | | | | | | Switch positions of source and directory sectionsPatrick Bajao2019-04-023-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated the documentation to match the updated order including the screenshot.
| * | | | | | | | | | Add documentation for download source code featurePatrick Bajao2019-04-022-0/+20
| | | | | | | | | | |
| * | | | | | | | | | Make the dropdown match the designPatrick Bajao2019-04-027-54/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regenerate locale.pot as well
| * | | | | | | | | | Download a folder from repositoryPatrick Bajao2019-04-0214-40/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `GetArchiveRequest` to git-archive params. Modifies `Git::Repository#archive_metadata` to append `path` to `ArchivePrefix` so it'll not hit the cache of repository archive when it already exists.
| * | | | | | | | | | Add download directory in menuKia Mei Somabes2019-04-024-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add subdirectory params for RepositoriesController#archive
* | | | | | | | | | | Merge branch ↵Achilleas Pipinellis2019-04-042-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '59979-update-documentation-about-only-allow-merge-requests-to-be-merged-if-the-pipeline-succeeds-to-take-into-account-the-settings-page-reorganization' into 'master' Update "Pipelines must succeed" documentation Closes #59979 See merge request gitlab-org/gitlab-ce!26945
| * | | | | | | | | | Update "Pipelines must succeed" docs59979-update-documentation-about-only-allow-merge-requests-to-be-merged-if-the-pipeline-succeeds-to-take-into-account-the-settings-page-reorganizationNathan Friend2019-04-032-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates the documentation about the "Pipelines must succeed" checkbox.
* | | | | | | | | | | Merge branch 'create-merge-pipelines-ce' into 'master'Kamil Trzciński2019-04-043-33/+11
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport: Use merge request MERGE ref for attached merge request pipelines See merge request gitlab-org/gitlab-ce!26702
| * | | | | | | | | | | Backport attached merge request pipelinescreate-merge-pipelines-ceShinya Maeda2019-04-043-33/+11
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes to CE
* | | | | | | | | | | Merge branch 'backstage/gb/add-pipeline-bridge-presenter' into 'master'Kamil Trzciński2019-04-042-0/+24
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pipeline bridge presenter See merge request gitlab-org/gitlab-ce!26911
| * | | | | | | | | | | Add pipeline bridge presenterbackstage/gb/add-pipeline-bridge-presenterGrzegorz Bizon2019-04-032-0/+24
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '55964-fix-email-encoding' into 'master'Sean McGivern2019-04-043-1/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent premailer from replacing HTML entities Closes #55964 See merge request gitlab-org/gitlab-ce!26931
| * | | | | | | | | | | | Prevent premailer from converting HTML entitiesHeinrich Lee Yu2019-04-043-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents `&mdash` in our templates being change to `-`
* | | | | | | | | | | | | Merge branch '3314-add-on-runner-minutes-for-gitlab-com-ce' into 'master'Douwe Maan2019-04-045-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport some changes from gitlab-ee!9815 Closes #3314 See merge request gitlab-org/gitlab-ce!25908
| * | | | | | | | | | | | | Backport some changes from EE3314-add-on-runner-minutes-for-gitlab-com-ceRubén Dávila2019-04-025-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9815
* | | | | | | | | | | | | | Merge branch 'add_backtrace_to_kubernetes_log' into 'master'Sean McGivern2019-04-047-189/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show backtrace when logging to kubernetes.log Closes #56768 See merge request gitlab-org/gitlab-ce!25726
| * | | | | | | | | | | | | | Do not send error name and message to SentryThong Kuah2019-04-042-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's duplication information as we already send the full error object to Sentry.
| * | | | | | | | | | | | | | Don't send error backtrace to SentryThong Kuah2019-04-042-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As it already has the full error sent to it
| * | | | | | | | | | | | | | Refactor to share tests for base class methodThong Kuah2019-04-045-203/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DRY up tests for logging error.
| * | | | | | | | | | | | | | Show backtrace when logging to kubernetes.logThong Kuah2019-04-046-6/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just the error message and error class alone makes it hard to determine the full context of any errors, so we need to know where the error is occuring as well.
* | | | | | | | | | | | | | | Merge branch '57662-api-updates-to-mr-and-pipeline' into 'master'Kamil Trzciński2019-04-047-4/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose pipeline in the related merge requests Closes #57662 See merge request gitlab-org/gitlab-ce!26367
| * | | | | | | | | | | | | | | Expose head pipeline in the related merge requestsAlexandru Croitor2019-04-047-4/+65
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose head pipeline for the MR in the api when requesting related merge requests for an issue and show a detailed status for the pipeline, which would include: details_path, favicon, group, icon, label, text, tooltip. https://gitlab.com/gitlab-org/gitlab-ce/issues/57662#note_152023412
* | | | | | | | | | | | | | | Merge branch '60005-fix-swipe-divider' into 'master'Phil Hughes2019-04-042-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix swipe diff divider Closes #60005 See merge request gitlab-org/gitlab-ce!26970
| * | | | | | | | | | | | | | | Move swipe diff border to the rightftab2019-04-042-2/+8
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Vue image diff app, the border needs to be on the right because the new image comes in from the left. The old image diff app which is used in commits and compare views had the new image visible by default and hiding away from the left.
* | | | | | | | | | | | | | | Merge branch 'winh-sidebar-todo' into 'master'Phil Hughes2019-04-042-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy sidebar todo component from EE Closes gitlab-ee#9954 See merge request gitlab-org/gitlab-ce!26915
| * | | | | | | | | | | | | | | Copy sidebar todo component from EEWinnie Hellmann2019-04-042-2/+9
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch '59878-deduplicate-dependencies' into 'master'Phil Hughes2019-04-041-17/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deduplicate frontend dependencies Closes #59878 See merge request gitlab-org/gitlab-ce!26916
| * | | | | | | | | | | | | | Deduplicate dependencies59878-deduplicate-dependenciesLukas Eipert2019-04-031-17/+2
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'support-time-windows-api' into 'master'James Lopez2019-04-048-14/+143
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support time window parameters in additional metrics endpoint See merge request gitlab-org/gitlab-ce!26228
| * | | | | | | | | | | | | Specify time window for additional metrics apisupport-time-windows-apisyasonik2019-04-038-14/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for start and end parameters in the #additional_metrics endpoint of the EnvironmentsController. start and end are meant to be unix timestamps, per the Prometheus API (as the consumer of this endpoint will eventually be transitioned to a prometheus endpoint). This functionality is behind the :metrics_time_window feature flag for development.
* | | | | | | | | | | | | | Merge branch 'only-changes-docs-update' into 'master'Evan Read2019-04-041-3/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs to `only:changes/except:changes` that discuss using regex in certain scenarios See merge request gitlab-org/gitlab-ce!26831
| * | | | | | | | | | | | | Add docs to `only:changes/except:changes` that discuss using regex in ↵Said Masoud2019-04-041-3/+27
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | certain scenarios
* | | | | | | | | | | | | Merge branch 'da-fix-broken-master' into 'master'Stan Hu2019-04-041-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken spec for Merge request > Revert modal See merge request gitlab-org/gitlab-ce!26961
| * | | | | | | | | | | | | Fix broken spec for Merge request > Revert modalDouglas Barbosa Alexandre2019-04-031-2/+4
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'docs-google_secure_ldap' into 'master'Evan Read2019-04-045-0/+215
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for Google Secure LDAP See merge request gitlab-org/gitlab-ce!26064
| * | | | | | | | | | | | | | Add documentation for Google Secure LDAPdocs-google_secure_ldapDrew Blessing2019-04-035-0/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of 11.9 GitLab supports Google Secure LDAP for authentication and group sync. This documentation outlines how to configure the service. Rename file
* | | | | | | | | | | | | | | Merge branch 'docs/refactor-pgloader' into 'master'Evan Read2019-04-041-147/+139
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up the mysql to postgres guide See merge request gitlab-org/gitlab-ce!24061
| * | | | | | | | | | | | | | Clean up the mysql to postgres guidedocs/refactor-pgloaderAchilleas Pipinellis2019-04-031-147/+139
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change refactors the pgloader instructions to have less headings and be more straightforward.
* | | | | | | | | | | | | | Merge branch '10879/fix-security-template-inclusion' into 'master'Douglas Barbosa Alexandre2019-04-041-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include DAST as dependent CI template See merge request gitlab-org/gitlab-ce!26956
| * | | | | | | | | | | | | | Include DAST as dependent CI templateLucas Charles2019-04-041-1/+3
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'mk/add-mkozono-to-backend-codeowners' into 'master'Douglas Barbosa Alexandre2019-04-041-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add @mkozono to backend CODEOWNERS Closes gitlab-com/www-gitlab-com#3355 See merge request gitlab-org/gitlab-ce!26947
| * | | | | | | | | | | | | | Add @mkozono to backend CODEOWNERSmk/add-mkozono-to-backend-codeownersMichael Kozono2019-04-031-2/+2
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'xanf/gitlab-ce-move-project-tags' into 'master'Clement Ho2019-04-033-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project overview UI: Line break when there are multiple project tags" Closes #55650 See merge request gitlab-org/gitlab-ce!26797
| * | | | | | | | | | | | | | Move topics to separate line in project overviewxanf/gitlab-ce-move-project-tagsIllya Klymov2019-04-033-4/+8
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ee-feature-doc-fixes' into 'master'Evan Read2019-04-031-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor EE feature doc fixes See merge request gitlab-org/gitlab-ce!26900
| * | | | | | | | | | | | | | | Use correct `ifEE` variable nameMark Florian2019-04-031-3/+3
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Presumably the `renderIfEE` is from an older edit.
* | | | | | | | | | | | | | | Merge branch '29249-show-download-diff-even-when-merge-request-is-closed' ↵59323-legend-showing-nan-for-avg-max-when-they-are-fractional-quantitiesMike Greiling2019-04-033-42/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Show download diff even when merge request is closed" Closes #29249 See merge request gitlab-org/gitlab-ce!26772
| * | | | | | | | | | | | | | Show Download diff links in closed MRs29249-show-download-diff-even-when-merge-request-is-closedFatih Acet2019-04-033-42/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Download MR diffs links were only available for open MRs, however it may still be useful for closed MRs.