Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add a changelog itemfix_diff_parsing | Valery Sizov | 2017-10-15 | 1 | -0/+5 |
| | |||||
* | Fix diff parser so it tolerates to diff special markers in the content | Valery Sizov | 2017-10-15 | 2 | -1/+20 |
| | |||||
* | Merge branch 'dm-api-authentication' into 'master' | Robert Speicher | 2017-10-12 | 5 | -105/+108 |
|\ | | | | | | | | | Move all API authentication code to APIGuard See merge request gitlab-org/gitlab-ce!14528 | ||||
| * | Move all API authentication code to APIGuard | Douwe Maan | 2017-10-12 | 5 | -105/+108 |
| | | |||||
* | | Merge branch '39001-mr-tabs-hover' into 'master' | Phil Hughes | 2017-10-12 | 1 | -0/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | Fixes from CSS refactor Closes #39001 and #38939 See merge request gitlab-org/gitlab-ce!14828 | ||||
| * | | Fixes from CSS refactor | Annabel Dunstone Gray | 2017-10-12 | 1 | -0/+2 |
|/ / | |||||
* | | Merge branch '35652-prometheus-service-page-shows-error' into 'master' | Phil Hughes | 2017-10-12 | 3 | -5/+18 |
|\ \ | | | | | | | | | | | | | | | | | | | Resolve "Prometheus service page shows error" Closes #35652 See merge request gitlab-org/gitlab-ce!14771 | ||||
| * | | Resolve "Prometheus service page shows error" | Jose Ivan Vargas Lopez | 2017-10-12 | 3 | -5/+18 |
|/ / | |||||
* | | Merge branch 'winh-shorten-inclusive-language-example-docs' into 'master' | Achilleas Pipinellis | 2017-10-12 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Shorten example translation for inclusive language See merge request gitlab-org/gitlab-ce!14833 | ||||
| * | | Shorten example translation for inclusive languagewinh-shorten-inclusive-language-example-docs | Winnie Hellmann | 2017-10-11 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'docs/gke-cluster' into 'master' | Achilleas Pipinellis | 2017-10-12 | 4 | -59/+172 |
|\ \ \ | | | | | | | | | | | | | | | | | Add docs for GKE integration See merge request gitlab-org/gitlab-ce!14712 | ||||
| * | | | Explicit state integration deletion | Achilleas Pipinellis | 2017-10-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix Google API callbackdocs/gke-cluster | Achilleas Pipinellis | 2017-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/38911#note_42966393 | ||||
| * | | | Add link to Google billing account | Achilleas Pipinellis | 2017-10-09 | 1 | -1/+3 |
| | | | | |||||
| * | | | Refine Google integration steps | Achilleas Pipinellis | 2017-10-06 | 1 | -8/+9 |
| | | | | |||||
| * | | | Fix broken link | Achilleas Pipinellis | 2017-10-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Remove Google sign-in requirement | Achilleas Pipinellis | 2017-10-06 | 1 | -6/+0 |
| | | | | |||||
| * | | | Simplify overview | Achilleas Pipinellis | 2017-10-05 | 1 | -2/+1 |
| | | | | |||||
| * | | | Refactor the Google integration page | Achilleas Pipinellis | 2017-10-05 | 1 | -59/+78 |
| | | | | |||||
| * | | | Add docs for GKE integration | Achilleas Pipinellis | 2017-10-05 | 3 | -0/+98 |
| | | | | |||||
* | | | | Merge branch 'docs/fix-dev-doc' into 'master' | Achilleas Pipinellis | 2017-10-12 | 2 | -1/+6 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix a missing link and create a separate "Testing guides" section See merge request gitlab-org/gitlab-ce!14819 | ||||
| * | | | | Fix a missing link and create a separate "Testing guides" sectiondocs/fix-dev-doc | Rémy Coutable | 2017-10-11 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | Merge branch ↵ | Tim Zallmann | 2017-10-12 | 5 | -7/+19 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39033-d3-js-is-being-included-in-the-user_profile-and-graphs_show-bundles' into 'master' Resolve "d3.js is being included in the user_profile and graphs_show bundles" Closes #39033 See merge request gitlab-org/gitlab-ce!14826 | ||||
| * | | | | Removed d3.js from the users and graphs bundle39033-d3-js-is-being-included-in-the-user_profile-and-graphs_show-bundles | Jose Ivan Vargas | 2017-10-11 | 5 | -7/+19 |
| | | | | | |||||
* | | | | | Merge branch '39028-repo-by-url-fields' into 'master' | Tim Zallmann | 2017-10-12 | 3 | -50/+56 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Add project fields to import project by url Closes #39028 See merge request gitlab-org/gitlab-ce!14822 | ||||
| * | | | | Update template description wording39028-repo-by-url-fields | Annabel Dunstone Gray | 2017-10-11 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Add project fields to import project by url | Annabel Dunstone Gray | 2017-10-11 | 2 | -47/+53 |
| | | | | | |||||
* | | | | | Merge branch 'issue-36484' into 'master' | Annabel Dunstone Gray | 2017-10-11 | 3 | -10/+15 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary alt-texts from pipeline emails See merge request gitlab-org/gitlab-ce!14602 | ||||
| * | | | | | Remove unnecessary alt-texts from pipeline emails | Gustav Ernberg | 2017-10-02 | 3 | -10/+15 |
| | | | | | | |||||
* | | | | | | Merge branch '38871-cleanup-data-page-attribute-after-karma-test' into 'master' | Clement Ho | 2017-10-11 | 12 | -22/+61 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup data-page attribute after each Karma test Closes #38871 See merge request gitlab-org/gitlab-ce!14742 | ||||
| * | | | | | | Cleanup data-page attribute after each Karma test38871-cleanup-data-page-attribute-after-karma-test | Eric Eastwood | 2017-10-11 | 12 | -22/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38871 | ||||
* | | | | | | | Merge branch 'replace_explore_projects.feature' into 'master' | Rémy Coutable | 2017-10-11 | 10 | -390/+377 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the 'features/explore/projects.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14755 | ||||
| * | | | | | | | Replace the 'features/explore/projects.feature' spinach test with an rspec ↵replace_explore_projects.feature | Vitaliy @blackst0ne Klachkov | 2017-10-11 | 10 | -390/+377 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | analog | ||||
* | | | | | | | | Merge branch '37660-match-sidebar-colors' into 'master' | Annabel Dunstone Gray | 2017-10-11 | 2 | -1/+6 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37660 Change background color of nav sidebar to match other gl sidebars Closes #37660 See merge request gitlab-org/gitlab-ce!14800 | ||||
| * | | | | | | | 37660 Change background color of nav sidebar to match other gl sidebars37660-match-sidebar-colors | tauriedavis | 2017-10-10 | 2 | -1/+6 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'ph-gl-form-js-modules' into 'master' | Filipa Lacerda | 2017-10-11 | 10 | -232/+214 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves form related JS modules out of global See merge request gitlab-org/gitlab-ce!14780 | ||||
| * | | | | | | | | spec fixesph-gl-form-js-modules | Phil Hughes | 2017-10-11 | 4 | -24/+15 |
| | | | | | | | | | |||||
| * | | | | | | | | Moves form related JS modules out of global | Phil Hughes | 2017-10-11 | 8 | -210/+201 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'backport-ee-change-for-test' into 'master' | Rémy Coutable | 2017-10-11 | 2 | -6/+2 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport EE change for setting up forked project See merge request gitlab-org/gitlab-ce!14817 | ||||
| * | | | | | | | | | Backport EE change for setting up forked projectbackport-ee-change-for-test | Lin Jen-Shin | 2017-10-11 | 2 | -6/+2 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'fix/pass-git-object-dir-attrs-as-relative' into 'master' | Douwe Maan | 2017-10-11 | 7 | -30/+70 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass git object dir attributes as relative paths to Gitaly Closes gitaly#629 See merge request gitlab-org/gitlab-ce!14713 | ||||
| * | | | | | | | | Pass git object dir attributes as relative paths to Gitaly | Ahmad Sherif | 2017-10-11 | 7 | -30/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitaly#629 | ||||
* | | | | | | | | | Merge branch 'winh-i18n-inclusive-language-docs' into 'master' | Achilleas Pipinellis | 2017-10-11 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add inclusive language to translation guidelines See merge request gitlab-org/gitlab-ce!14815 | ||||
| * | | | | | | | | | Add inclusive language to translation guidelineswinh-i18n-inclusive-language | Winnie Hellmann | 2017-10-11 | 1 | -0/+12 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'docs-patch-28' into 'master' | Achilleas Pipinellis | 2017-10-11 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Update image commenting MR link in docs See merge request gitlab-org/gitlab-ce!14816 | ||||
| * | | | | | | | | Update image commenting MR link | Clement Ho | 2017-10-11 | 1 | -1/+2 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'rs-mysql-groups-dashboard-failure' into 'master' | Douwe Maan | 2017-10-11 | 1 | -10/+10 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a feature spec failing only on MySQL Closes #39003 See merge request gitlab-org/gitlab-ce!14811 | ||||
| * | | | | | | | | Fix a feature spec failing only on MySQLrs-mysql-groups-dashboard-failure | Robert Speicher | 2017-10-11 | 1 | -10/+10 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'move_markdown_preview_to_concern' into 'master' | Sean McGivern | 2017-10-11 | 9 | -36/+57 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for markdown preview to group milestones Closes #30241 See merge request gitlab-org/gitlab-ce!14806 | ||||
| * | | | | | | | | | Add support for markdown preview to group milestonesmove_markdown_preview_to_concern | Vitaliy @blackst0ne Klachkov | 2017-10-11 | 9 | -36/+57 |
| | |_|_|_|/ / / / | |/| | | | | | | |