summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Adds "the" to the new label page to correct the sentence.Sam Beckham2018-06-012-2/+2
* Merge branch '47113-modal-header-styling-is-broken' into 'master'Filipa Lacerda2018-06-0116-26/+37
|\
| * Updated the styling for modal titlessamdbeckham2018-06-016-7/+7
| * Updates a load of modal headers to use better markupsamdbeckham2018-06-0116-21/+32
* | Merge branch 'ce-6145-extract-app-views-shared-issuable' into 'master'Robert Speicher2018-06-013-8/+12
|\ \
| * | Unify app/views/shared/issuable/form/_merge_params.html.hamlLin Jen-Shin2018-06-011-7/+3
| * | Unify app/views/shared/issuable/_sidebar.html.hamlLin Jen-Shin2018-06-011-1/+6
| * | Unify app/views/shared/issuable/_form.html.hamlLin Jen-Shin2018-06-011-0/+3
* | | Merge branch '46815-monitoring-active-tab' into 'master'Clement Ho2018-06-011-2/+2
|\ \ \ | |_|/ |/| |
| * | Fix active states on monitoring logs tabsAnnabel Dunstone Gray2018-05-311-2/+2
* | | Merge branch 'update-preferences-header' into 'master'Douwe Maan2018-06-011-1/+1
|\ \ \
| * | | Externalize user preferences stringAndreas Kämmerle2018-05-311-1/+1
| * | | Remove 'GitLab' from user preferences headerAndreas Kämmerle2018-05-311-1/+1
* | | | Merge branch '46840-fix-merge-request-unmergeable-email-plural' into 'master'Sean McGivern2018-06-012-2/+2
|\ \ \ \
| * | | | Fix merge request unmergeable notification email plural interpolation46840-fix-merge-request-unmergeable-email-pluralMark Chao2018-05-312-2/+2
* | | | | Merge branch 'ide-jobs-list-components' into 'master'Filipa Lacerda2018-06-011-1/+3
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into ide-jobs-list-componentside-jobs-list-componentsPhil Hughes2018-05-3111-78/+76
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into ide-jobs-list-componentsPhil Hughes2018-05-3039-58/+69
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into ide-jobs-list-componentsPhil Hughes2018-05-2914-99/+233
| |\ \ \ \ \ \ \
| * | | | | | | | added correct help path to empty statePhil Hughes2018-05-291-1/+2
| * | | | | | | | added empty state & YAML error statePhil Hughes2018-05-291-1/+2
* | | | | | | | | Merge branch '46487-add-support-for-jupyter-in-gitlab-via-kubernetes' into 'm...Dmitriy Zaporozhets2018-06-011-0/+1
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 46487-add-support-for-jupyt...Dmitriy Zaporozhets2018-05-30466-2070/+2225
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add support for Jupyter in GitLab via KubernetesDmitriy Zaporozhets2018-05-251-0/+1
* | | | | | | | | | | Merge branch '46997-fix-fogbugz-import-form-bs4' into 'master'Annabel Gray2018-06-011-6/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Fix FogBugz import form col sizingPaul Slaughter2018-05-311-6/+6
* | | | | | | | | | | Update 404 and 403 pagesPaul Slaughter2018-05-314-68/+47
* | | | | | | | | | | Merge branch 'bootstrap-squash-alignment' into 'master'Annabel Gray2018-05-311-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix bootstrap squash checkbox alignmentClement Ho2018-05-311-2/+2
* | | | | | | | | | | | Merge branch '46817-new-application' into 'master'Clement Ho2018-05-311-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix new application layoutAnnabel Dunstone Gray2018-05-311-3/+3
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jivl-update-form-horizontal-usage' into 'master'Annabel Gray2018-05-313-8/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove form-horizontal class where applicableJose2018-05-313-8/+8
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Fix checkbox/radio button structureClement Ho2018-05-3143-215/+205
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Fix snippets embed formClement Ho2018-05-311-6/+5
|/ / / / / / / / /
* | | | | | | | | Fix active tab stylingAnnabel Gray2018-05-311-10/+10
* | | | | | | | | Export assigned issues in iCalendar feedImre Farkas2018-05-3110-15/+34
* | | | | | | | | Cleanup code for General Project SettingsLukas Eipert2018-05-315-41/+49
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge branch 'dm-relative-url-root-in-development' into 'master'Rémy Coutable2018-05-311-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fix various bugs related to relative_url_root in developmentDouwe Maan2018-05-291-1/+1
* | | | | | | | Update "col-xs" usage to bootstrap4Paul Slaughter2018-05-302-4/+4
* | | | | | | | Merge branch 'fix-nbsp-after-sign-in-with-google' into 'master'Filipa Lacerda2018-05-301-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix   after sign-in with Google buttonfix-nbsp-after-sign-in-with-googleKamil Trzciński2018-05-301-2/+1
* | | | | | | | | Merge branch '46879-import-project-alignment' into 'master'Clement Ho2018-05-304-65/+63
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fix import project by url layoutAnnabel Dunstone Gray2018-05-294-65/+63
* | | | | | | | | Merge branch 'mattermost-api-v4' into 'master'Sean McGivern2018-05-301-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Updated help text for team list for Mattermost slash commandsHarrison Healey2018-05-291-2/+2
* | | | | | | | | | Merge branch 'render_super' into 'master'Rémy Coutable2018-05-302-4/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Unify app/views/shared/issuable/form/_title.html.hamlLin Jen-Shin2018-05-282-4/+5
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'Phil Hughes2018-05-302-0/+11
|\ \ \ \ \ \ \ \ \
View Lorry Controller Status