summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update command-line-commands to add clarity on where one can edit codedocs-interact-with-gitMike Lewis2019-05-011-1/+3
|
* Update README to add more context on Git BasicsMike Lewis2019-05-011-2/+4
|
* Merge branch 'bertrand-lpl-master-patch-56649' into 'master'docs-subscription-changes-and-dataMike Lewis2019-05-011-1/+1
|\ | | | | | | | | Replace misinterpreted `|` caracter in a table See merge request gitlab-org/gitlab-ce!25319
| * Replace misinterpreted `|` caracter in a table Bertrand Jamin2019-02-171-1/+1
| |
* | Merge branch 'js-i18n-notes' into 'master'Clement Ho2019-05-014-8/+31
|\ \ | | | | | | | | | | | | Internationalisation of notes directory See merge request gitlab-org/gitlab-ce!27726
| * | Internationalisation of notes directoryBrandon Labuschagne2019-05-014-8/+31
|/ / | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | Merge branch 'js-i18n-behaviors' into 'master'Clement Ho2019-05-015-6/+29
|\ \ | | | | | | | | | | | | i18n the behaviors directory See merge request gitlab-org/gitlab-ce!27637
| * | Internationalisation of behaviors directoryBrandon Labuschagne2019-05-015-6/+29
|/ / | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | Merge branch 'js-i18n-board' into 'master'Clement Ho2019-05-015-5/+22
|\ \ | | | | | | | | | | | | Internationalisation of boards directory See merge request gitlab-org/gitlab-ce!27672
| * | Internationalisation of board directoryBrandon Labuschagne2019-05-015-5/+22
|/ / | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | Merge branch 'js-i18n-filtered-search' into 'master'Clement Ho2019-05-019-18/+41
|\ \ | | | | | | | | | | | | Internationalisation of filtered_search directory See merge request gitlab-org/gitlab-ce!27678
| * | Internationalisation of filtered_search directoryBrandon Labuschagne2019-05-019-18/+41
|/ / | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | Merge branch '9962-ee-diff-note-actions' into 'master'Phil Hughes2019-05-012-9/+15
|\ \ | | | | | | | | | | | | Resolve "Move EE differences for `app/assets/javascripts/notes/components/note_actions.vue`" See merge request gitlab-org/gitlab-ce!27900
| * | Resolve "Move EE differences for ↵Natalia Tepluhina2019-05-012-9/+15
|/ / | | | | | | `app/assets/javascripts/notes/components/note_actions.vue`"
* | Merge branch '10694-propagate-env-vars-only-if-set-ce' into 'master'Douwe Maan2019-05-012-18/+38
|\ \ | | | | | | | | | | | | Propagate ENV vars to SAST and Dependency Scanning Docker containers only if they are set See merge request gitlab-org/gitlab-ce!27659
| * | Propagate ENV vars to SAST and Dependency Scanning Docker containers only if ↵Victor Zagorodny2019-05-012-18/+38
|/ / | | | | | | they are set
* | Merge branch 'fj-refactor-mirror-instructions-view' into 'master'Sean McGivern2019-05-012-1/+5
|\ \ | | | | | | | | | | | | Refactor mirror instructions view See merge request gitlab-org/gitlab-ce!27901
| * | Refactor mirror instructions viewFrancisco Javier López2019-05-012-1/+5
|/ /
* | Merge branch 'bvl-upload-designs-fix-ce' into 'master'Douwe Maan2019-05-012-3/+11
|\ \ | | | | | | | | | | | | Make Gitlab::GlRepository#types an instance method See merge request gitlab-org/gitlab-ce!27902
| * | Make Gitlab::GlRepository#types an instance methodBob Van Landuyt2019-04-302-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | Having this as an instance method makes it easier to override in the prepended `EE` module. If we try to override this method on the module itself, it would not be overridden correctly, depending on the load order.
* | | Merge branch 'add-specs-for-group-routing-spec' into 'master'Yorick Peterse2019-05-011-0/+14
|\ \ \ | | | | | | | | | | | | | | | | Add specs to group routing spec See merge request gitlab-org/gitlab-ce!27705
| * | | Add specs to group routing specadd-specs-for-group-routing-specMałgorzata Ksionek2019-04-261-0/+14
| | | |
* | | | Merge branch '59974-multiple-dashboards-be' into 'master'Sean McGivern2019-05-0120-108/+563
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve BE for "Load dashboards from project's git repository" Closes #59974 See merge request gitlab-org/gitlab-ce!27608
| * | | | Update metrics dashboard API to load yml from repoSarah Yasonik2019-05-0120-108/+563
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the EnvironmentController#metrics_dashboard endpoint to support a "dashboard" param, which can be used to specify the filepath of a dashboard configuration from a project repository. Dashboard configurations are expected to be stored in .gitlab/dashboards/. Updates dashboard post-processing steps to exclude custom metrics, which should only display on the system dashboard.
* | | | Merge branch 'add-project-level-config-for-merge-train-ce' into 'master'Sean McGivern2019-05-013-1/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE Backport: Add project level config for merge train See merge request gitlab-org/gitlab-ce!27819
| * | | | Add project level config for merge trainadd-project-level-config-for-merge-train-ceShinya Maeda2019-04-303-1/+19
| | |/ / | |/| | | | | | | | | | We add the option and expose the parameter for frontend work
* | | | Merge branch '58294-discussion-notes-component' into 'master'Phil Hughes2019-05-019-211/+418
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract discussion notes into new component Closes #58294 See merge request gitlab-org/gitlab-ce!27066
| * | | | Extract discussion notes into new componentPaul Gascou-Vaillancourt2019-05-019-211/+418
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Moved discussion notes out of `NoteableDiscussion` component into a new `DiscussionNotes` component - Wrote Jest tests for the new `DiscussionNotes` component - Updated Jest config for emojis fixtures - Updated Karma tests `NoteableDiscussion` to match its new structure - Convert `DiffDiscussions` tests to use Vue test utils
* | | | Update CHANGELOG.md for 11.10.4GitLab Release Tools Bot2019-05-0114-66/+23
| | | | | | | | | | | | [ci skip]
* | | | Merge branch 'fix-webpack-assets-relative-url-bug' into 'master'Phil Hughes2019-05-012-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix webpack asset patch with '/' as relative root See merge request gitlab-org/gitlab-ce!27909
| * | | | Fix webpack asset patch with '/' as relative rootPaul Slaughter2019-04-302-1/+8
| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/60932
* | | | | Merge branch 'js-i18n-raven' into 'master'28996-automatic-https-certificate-creation-renewal-for-pages-custom-domains-3Phil Hughes2019-05-012-4/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Internationalisation of raven directory See merge request gitlab-org/gitlab-ce!27741
| * | | | | Internationalisation of raven directoryBrandon Labuschagne2019-05-012-4/+17
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | Merge branch 'winh-binary-fixture-path' into 'master'Phil Hughes2019-05-015-5/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use FIXTURES_PATH constant for binary fixtures in frontend tests See merge request gitlab-org/gitlab-ce!27891
| * | | | | Use FIXTURES_PATH for loading test.pdfWinnie Hellmann2019-04-304-4/+10
| | | | | |
| * | | | | Use FIXTURES_PATH in balsamiq_viewer_integration_spec.jsWinnie Hellmann2019-04-302-2/+4
| | | | | |
* | | | | | Merge branch 'winh-jest-ide' into 'master'Phil Hughes2019-05-012-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove babel environment for Jest Closes #59164 See merge request gitlab-org/gitlab-ce!27676
| * | | | | | Remove babel environment for JestWinnie Hellmann2019-04-252-4/+4
| | | | | | |
* | | | | | | Merge branch 'docs-repo-merge-9-analytics' into 'master'Achilleas Pipinellis2019-05-013-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge EE doc/analytics to CE See merge request gitlab-org/gitlab-ce!27699
| * | | | | | | Docs: Merge EE doc/analytics to CEMarcel Amirault2019-05-013-1/+11
|/ / / / / / /
* | | | | | | Merge branch 'docs-ssh-maxstartups' into 'master'Achilleas Pipinellis2019-05-011-0/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SSH MaxStartups documentation See merge request gitlab-org/gitlab-ce!27837
| * | | | | | | Add SSH MaxStartups documentationDrew Blessing2019-05-011-0/+27
|/ / / / / / /
* | | | | | | Merge branch '10011-boards' into 'master'Kushal Pandya2019-05-012-0/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add isEE check in milestone See merge request gitlab-org/gitlab-ce!27814
| * | | | | | | Only get milestone when EERajat Jain2019-04-302-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create boards_util to conditionally `getMilestone` when in EE
* | | | | | | | Merge branch 'doc/use-y-for-apt-install-redis-server' into 'master'Evan Read2019-05-011-5/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve `installation from source` documentation See merge request gitlab-org/gitlab-ce!25530
| * | | | | | | | Small improvements of the "install from source" documentationPeter Vandenabeele2019-04-301-5/+7
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch '57718-missing-supported-feature-in-registry-documentation' ↵Evan Read2019-05-011-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add missing regionendpoint documentation. Closes #57718 See merge request gitlab-org/gitlab-ce!25297
| * | | | | | | | add missing regionendpoint documentation.Maxime Roussin-Bélanger2019-02-271-1/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'osw-multiple-assignees-docs' into 'master'Evan Read2019-04-304-3/+116
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport docs update for multiple assignees for MRs See merge request gitlab-org/gitlab-ce!27221
| * | | | | | | | | Backport docs update for multiple assignees for MRsOswaldo Ferreira2019-04-304-3/+116
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports API and quick action docs.