summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'groups-controller-show-performance' into 'master'Douwe Maan2018-05-291-18/+8
|\
| * Reduce queries in GroupProjectsFinderYorick Peterse2018-05-281-18/+8
* | Add helpful messages to empty wiki viewPaul Slaughter2018-05-296-8/+53
* | Merge branch 'ab-45389-remove-double-checked-internal-id-generation' into 'ma...Yorick Peterse2018-05-281-20/+4
|\ \
| * | Remove double-checked internal id generation.Andreas Brandl2018-05-281-20/+4
* | | Merge branch 'ce-6225-unify-app-views-milestones' into 'master'Rémy Coutable2018-05-282-1/+5
|\ \ \
| * | | Bring changes from EELin Jen-Shin2018-05-282-1/+5
* | | | Resolve "Rename "secret variables" to "variables""Fabio Busatto2018-05-282-2/+2
* | | | Merge branch 'patch-28' into 'master'Kamil Trzciński2018-05-281-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Update object_storage.rbShinya Maeda2018-05-281-1/+1
| |/ /
* | | Merge branch 'leipert-backport-bs4-merge-conflict' into 'master'Fatih Acet2018-05-281-6/+4
|\ \ \ | |_|/ |/| |
| * | backport EE version ofLukas Eipert2018-05-281-6/+4
| |/
* | Merge branch 'sh-fix-admin-page-counts-take-2' into 'master'Yorick Peterse2018-05-283-12/+20
|\ \
| * | Fix fast admin counters not working when PostgreSQL has secondariessh-fix-admin-page-counts-take-2Stan Hu2018-05-253-12/+20
* | | Merge branch '45190-create-notes-diff-files' into 'master'Douwe Maan2018-05-287-22/+82
|\ \ \ | |_|/ |/| |
| * | Persist truncated note diffs on a new table45190-create-notes-diff-filesOswaldo Ferreira2018-05-247-22/+82
* | | Merge branch 'leipert-move-ee-specific-pipeline-scss-backport' into 'master'Annabel Gray2018-05-251-41/+61
|\ \ \ | |_|/ |/| |
| * | backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/...leipert-move-ee-specific-pipeline-scss-backportLukas Eipert2018-05-251-41/+61
* | | Merge branch 'winh-new-merge-request-encoding' into 'master'Mike Greiling2018-05-251-1/+1
|\ \ \
| * | | Remove duplicate escaping from branch dropdownWinnie Hellmann2018-05-251-1/+1
* | | | Merge branch 'bootstrap4' into 'master'Mike Greiling2018-05-25652-3055/+2865
|\ \ \ \ | |_|/ / |/| | |
| * | | Add text-secondary colors backClement Ho2018-05-251-0/+5
| * | | Fix active sessions card layoutClement Ho2018-05-252-3/+4
| * | | Fix login tabsAnnabel Dunstone Gray2018-05-246-22/+26
| * | | Fix new issue page breakpointsAnnabel Dunstone Gray2018-05-243-10/+12
| * | | Fix hide whitespace changes buttonClement Ho2018-05-241-1/+1
| * | | Revert diff-files-changed sticky barClement Ho2018-05-241-1/+1
| * | | Fix admin user projects tableAnnabel Dunstone Gray2018-05-242-3/+3
| * | | Merge branch 'master' into bootstrap4Clement Ho2018-05-2423-62/+192
| |\ \ \ | | |/ /
| * | | Fix pipelines specClement Ho2018-05-241-0/+5
| * | | Fix d-sm-block for wiki sidebarClement Ho2018-05-241-1/+1
| * | | Replace data-test=page with .js-pagination-pageClement Ho2018-05-241-1/+1
| * | | Re-add form-checkClement Ho2018-05-241-4/+5
| * | | Fix new project viewAnnabel Dunstone Gray2018-05-242-1/+2
| * | | Remove unnecessary milestone additionClement Ho2018-05-241-2/+0
| * | | Remove tooltip bootstrap migration additionClement Ho2018-05-241-5/+0
| * | | Revert diff notes bundle changeClement Ho2018-05-241-3/+2
| * | | Fix group settings layoutAnnabel Dunstone Gray2018-05-242-7/+7
| * | | Fix pipeline job tooltipClement Ho2018-05-241-0/+1
| * | | Fix collapsed sidebar tooltipsClement Ho2018-05-2410-22/+28
| * | | Fix external user badge colorAnnabel Dunstone Gray2018-05-241-0/+5
| * | | Replace remaining .radio and .checkbox with .form-checkClement Ho2018-05-243-5/+5
| * | | Remove unused btn-group-justifiedClement Ho2018-05-241-4/+0
| * | | Update class name to not use bootstrap's text-light classAnnabel Dunstone Gray2018-05-232-2/+2
| * | | Fix remove group modalAnnabel Dunstone Gray2018-05-231-1/+1
| * | | Fix clone URL alignment on project pageAnnabel Dunstone Gray2018-05-234-10/+12
| * | | Fix help text for general settings permissionsClement Ho2018-05-231-1/+1
| * | | Restore tooltip arrowsClement Ho2018-05-231-1/+1
| * | | Fix members table layoutAnnabel Dunstone Gray2018-05-233-4/+7
| * | | Fix bad merge conflictClement Ho2018-05-231-1/+1