Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Adds "the" to the new label page to correct the sentence. | Sam Beckham | 2018-06-01 | 2 | -2/+2 |
| | |||||
* | Merge branch '47113-modal-header-styling-is-broken' into 'master' | Filipa Lacerda | 2018-06-01 | 16 | -26/+37 |
|\ | | | | | | | | | | | | | Resolve "Modal header styling is broken" Closes #47113 See merge request gitlab-org/gitlab-ce!19312 | ||||
| * | Updated the styling for modal titles | samdbeckham | 2018-06-01 | 6 | -7/+7 |
| | | |||||
| * | Updates a load of modal headers to use better markup | samdbeckham | 2018-06-01 | 16 | -21/+32 |
| | | |||||
* | | Merge branch 'ce-6145-extract-app-views-shared-issuable' into 'master' | Robert Speicher | 2018-06-01 | 3 | -8/+12 |
|\ \ | | | | | | | | | | | | | CE: Part of "Extract EE specific files/lines for app/views/shared/issuable" See merge request gitlab-org/gitlab-ce!19113 | ||||
| * | | Unify app/views/shared/issuable/form/_merge_params.html.haml | Lin Jen-Shin | 2018-06-01 | 1 | -7/+3 |
| | | | |||||
| * | | Unify app/views/shared/issuable/_sidebar.html.haml | Lin Jen-Shin | 2018-06-01 | 1 | -1/+6 |
| | | | |||||
| * | | Unify app/views/shared/issuable/_form.html.haml | Lin Jen-Shin | 2018-06-01 | 1 | -0/+3 |
| | | | |||||
* | | | Merge branch '46815-monitoring-active-tab' into 'master' | Clement Ho | 2018-06-01 | 1 | -2/+2 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Resolve "Admin area > Monitoring > Logs > No default active tab" Closes #46815 See merge request gitlab-org/gitlab-ce!19298 | ||||
| * | | Fix active states on monitoring logs tabs | Annabel Dunstone Gray | 2018-05-31 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'update-preferences-header' into 'master' | Douwe Maan | 2018-06-01 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Remove 'GitLab' from user preferences header See merge request gitlab-org/gitlab-ce!19289 | ||||
| * | | | Externalize user preferences string | Andreas Kämmerle | 2018-05-31 | 1 | -1/+1 |
| | | | | |||||
| * | | | Remove 'GitLab' from user preferences header | Andreas Kämmerle | 2018-05-31 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch '46840-fix-merge-request-unmergeable-email-plural' into 'master' | Sean McGivern | 2018-06-01 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Unmergeable merge request notification text interpolation" Closes #46840 See merge request gitlab-org/gitlab-ce!19160 | ||||
| * | | | | Fix merge request unmergeable notification email plural interpolation46840-fix-merge-request-unmergeable-email-plural | Mark Chao | 2018-05-31 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch 'ide-jobs-list-components' into 'master' | Filipa Lacerda | 2018-06-01 | 1 | -1/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show CI jobs in IDE Closes #44604 See merge request gitlab-org/gitlab-ce!19106 | ||||
| * \ \ \ \ | Merge branch 'master' into ide-jobs-list-componentside-jobs-list-components | Phil Hughes | 2018-05-31 | 11 | -78/+76 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into ide-jobs-list-components | Phil Hughes | 2018-05-30 | 39 | -58/+69 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into ide-jobs-list-components | Phil Hughes | 2018-05-29 | 14 | -99/+233 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | added correct help path to empty state | Phil Hughes | 2018-05-29 | 1 | -1/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | added empty state & YAML error state | Phil Hughes | 2018-05-29 | 1 | -1/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '46487-add-support-for-jupyter-in-gitlab-via-kubernetes' into ↵ | Dmitriy Zaporozhets | 2018-06-01 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Add support for Jupyter in GitLab via Kubernetes" Closes #46487 See merge request gitlab-org/gitlab-ce!19019 | ||||
| * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into ↵ | Dmitriy Zaporozhets | 2018-05-30 | 466 | -2070/+2225 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46487-add-support-for-jupyter-in-gitlab-via-kubernetes | ||||
| * | | | | | | | | | | Add support for Jupyter in GitLab via Kubernetes | Dmitriy Zaporozhets | 2018-05-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | | | | | | Merge branch '46997-fix-fogbugz-import-form-bs4' into 'master' | Annabel Gray | 2018-06-01 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "New Project > Import Project > FogBugz Import" Closes #46997 See merge request gitlab-org/gitlab-ce!19295 | ||||
| * | | | | | | | | | | Fix FogBugz import form col sizing | Paul Slaughter | 2018-05-31 | 1 | -6/+6 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Update 404 and 403 pages | Paul Slaughter | 2018-05-31 | 4 | -68/+47 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'bootstrap-squash-alignment' into 'master' | Annabel Gray | 2018-05-31 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bootstrap squash checkbox alignment Closes #47055 See merge request gitlab-org/gitlab-ce!19292 | ||||
| * | | | | | | | | | | | Fix bootstrap squash checkbox alignment | Clement Ho | 2018-05-31 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch '46817-new-application' into 'master' | Clement Ho | 2018-05-31 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Admin area > New Application form" Closes #46817 See merge request gitlab-org/gitlab-ce!19290 | ||||
| * | | | | | | | | | | | Fix new application layout | Annabel Dunstone Gray | 2018-05-31 | 1 | -3/+3 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jivl-update-form-horizontal-usage' into 'master' | Annabel Gray | 2018-05-31 | 3 | -8/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove form-horizontal class where applicable Closes #46744 See merge request gitlab-org/gitlab-ce!19262 | ||||
| * | | | | | | | | | | | Remove form-horizontal class where applicable | Jose | 2018-05-31 | 3 | -8/+8 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Fix checkbox/radio button structure | Clement Ho | 2018-05-31 | 43 | -215/+205 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Fix snippets embed form | Clement Ho | 2018-05-31 | 1 | -6/+5 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Fix active tab styling | Annabel Gray | 2018-05-31 | 1 | -10/+10 |
| | | | | | | | | | |||||
* | | | | | | | | | Export assigned issues in iCalendar feed | Imre Farkas | 2018-05-31 | 10 | -15/+34 |
| | | | | | | | | | |||||
* | | | | | | | | | Cleanup code for General Project Settings | Lukas Eipert | 2018-05-31 | 5 | -41/+49 |
| |_|_|_|_|/ / / |/| | | | | | | | |||||
* | | | | | | | | Merge branch 'dm-relative-url-root-in-development' into 'master' | Rémy Coutable | 2018-05-31 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Fix various bugs related to relative_url_root in development See merge request gitlab-org/gitlab-ce!19213 | ||||
| * | | | | | | | Fix various bugs related to relative_url_root in development | Douwe Maan | 2018-05-29 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Update "col-xs" usage to bootstrap4 | Paul Slaughter | 2018-05-30 | 2 | -4/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'fix-nbsp-after-sign-in-with-google' into 'master' | Filipa Lacerda | 2018-05-30 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix after sign-in with Google button Closes #45551 See merge request gitlab-org/gitlab-ce!19249 | ||||
| * | | | | | | | | Fix after sign-in with Google buttonfix-nbsp-after-sign-in-with-google | Kamil Trzciński | 2018-05-30 | 1 | -2/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '46879-import-project-alignment' into 'master' | Clement Ho | 2018-05-30 | 4 | -65/+63 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "BS4: Import project page is missing margins and wells" Closes #46879 See merge request gitlab-org/gitlab-ce!19215 | ||||
| * | | | | | | | | Fix import project by url layout | Annabel Dunstone Gray | 2018-05-29 | 4 | -65/+63 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'mattermost-api-v4' into 'master' | Sean McGivern | 2018-05-30 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated Mattermost integration to use Mattermost API v4 Closes #41631 See merge request gitlab-org/gitlab-ce!19043 | ||||
| * | | | | | | | | | Updated help text for team list for Mattermost slash commands | Harrison Healey | 2018-05-29 | 1 | -2/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'render_super' into 'master' | Rémy Coutable | 2018-05-30 | 2 | -4/+5 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Add render_ce to render CE partial in EE partial See merge request gitlab-org/gitlab-ce!19150 | ||||
| * | | | | | | | | | Unify app/views/shared/issuable/form/_title.html.haml | Lin Jen-Shin | 2018-05-28 | 2 | -4/+5 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master' | Phil Hughes | 2018-05-30 | 2 | -0/+11 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Squash and merge in GitLab Core (CE)" Closes #34591 See merge request gitlab-org/gitlab-ce!18956 |