summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Try to always find the merge base using `origin/#{branch}` instead of just `#...rc/27742-display-member-role-per-projectRémy Coutable2017-11-221-1/+1
* display project access role on all project listing pagesMike Greiling2017-11-225-5/+11
* display group access role on user profile page group tabMike Greiling2017-11-223-2/+10
* remove unused partial params and fix styling for missing description textMike Greiling2017-11-223-31/+9
* rename user-access-type to user-access-roleMike Greiling2017-11-224-4/+4
* reset font-weight for user access badgeMike Greiling2017-11-221-0/+1
* fix group page row highlight with empty description blockMike Greiling2017-11-221-0/+4
* update style for group dashboard project membership indicatorMike Greiling2017-11-221-2/+2
* move note-role-access into a more generic class for use elsewhereMike Greiling2017-11-224-9/+13
* remove $notes-role-color variableMike Greiling2017-11-222-2/+1
* Merge branch '40283-fix-missing-mr-widget-status-icons' into 'master'Tim Zallmann2017-11-221-1/+1
|\
| * Fix missing MR widget status icons40283-fix-missing-mr-widget-status-iconsEric Eastwood2017-11-221-1/+1
* | Merge branch '40444-upgrade-axios-from-0-16-2-to-0-17-1' into 'master'Filipa Lacerda2017-11-222-10/+16
|\ \
| * | Updated axios40444-upgrade-axios-from-0-16-2-to-0-17-1Tim Zallmann2017-11-222-10/+16
* | | Merge branch 'pawel/disable_prometheus_metrics' into 'master'Stan Hu2017-11-222-3/+8
|\ \ \
| * | | Force disable Prometheus metricsPawel Chojnacki2017-11-222-3/+8
* | | | Merge branch 'jivl-replace-vue-resource-prometheus-dashboard' into 'master'Filipa Lacerda2017-11-223-26/+14
|\ \ \ \
| * | | | Replaced vue-resource for axios in the prometheus dashboardjivl-replace-vue-resource-prometheus-dashboardJose Ivan Vargas2017-11-223-26/+14
* | | | | Merge branch '38877-disable-autocomplete-in-filtered-search' into 'master'Clement Ho2017-11-223-1/+11
|\ \ \ \ \
| * | | | | Disables autocomplete in filtered searchJacopo2017-11-203-1/+11
* | | | | | Merge branch '40295-fix-reply-quote-shortcut-on-mr' into 'master'Clement Ho2017-11-224-1/+55
|\ \ \ \ \ \
| * | | | | | Fix reply quote keyboard shortcut on MRs40295-fix-reply-quote-shortcut-on-mrEric Eastwood2017-11-214-1/+55
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'qa/gb/backport-geo-integration-tests-commons' into 'master'Rémy Coutable2017-11-2211-4/+153
|\ \ \ \ \ \
| * | | | | | Backport QA code that belongs to CE from EE Geoqa/gb/backport-geo-integration-tests-commonsRémy Coutable2017-11-2211-4/+153
* | | | | | | Merge branch 'improve-extra-queries-output' into 'master'Rémy Coutable2017-11-222-5/+12
|\ \ \ \ \ \ \
| * | | | | | | Improve output for extra queries in specsimprove-extra-queries-outputSean McGivern2017-11-222-5/+12
* | | | | | | | Merge branch 'docs-install-locale-compile' into 'master'Rubén Dávila2017-11-221-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Switch to using gettext:compile instead of gettext:pack in the installdocs-install-locale-compileDJ Mountney2017-11-201-2/+1
* | | | | | | | | Merge branch '40354-improve-ee_compat_check' into 'master'Sean McGivern2017-11-222-32/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Try to find the merge-base against the canonical masterRémy Coutable2017-11-222-32/+39
* | | | | | | | | | Merge branch 'group-new-miletone-breadcrumb' into 'master'Filipa Lacerda2017-11-222-1/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Fixed new group milestone breadcrumbPhil Hughes2017-11-222-1/+5
* | | | | | | | | | Merge branch '39720-group-milestone-sorting' into 'master'Sean McGivern2017-11-226-1/+133
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add group milestone to feature spec and minor changesGeorge Andrinopoulos2017-11-074-30/+13
| * | | | | | | | | Add Group Milestone sortingGeorge Andrinopoulos2017-11-077-1/+150
* | | | | | | | | | Merge branch 'sh-add-query-recorder-debugging' into 'master'Sean McGivern2017-11-222-0/+53
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add QUERY_RECORDER_DEBUG environment variable to improve performance debuggingsh-add-query-recorder-debuggingStan Hu2017-11-212-0/+53
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'feature_add_mermaid' into 'master'Phil Hughes2017-11-2219-41/+211
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Add support of MermaidVitaliy @blackst0ne Klachkov2017-11-2219-41/+211
* | | | | | | | | | Merge branch 'gitaly-fetch-source-branch' into 'master'Sean McGivern2017-11-228-11/+49
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add FetchSourceBranch Gitaly callJacob Vosmaer (GitLab)2017-11-228-11/+49
|/ / / / / / / / /
* | | | | | | | | Update VERSION to 10.3.0-prev10.3.0.preMichael Kozono2017-11-211-1/+1
* | | | | | | | | Update CHANGELOG.md for 10.2.0Michael Kozono2017-11-21147-744/+187
* | | | | | | | | Merge remote-tracking branch 'dev/master'Michael Kozono2017-11-210-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2017-11-2172-270/+813
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix offense to the LineBreakAfterGuardClauses copRémy Coutable2017-11-201-0/+2
* | | | | | | | | | | Merge branch 'fix-ci-pipelines-index' into 'master'Yorick Peterse2017-11-213-2/+42
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update composite pipelines index to include "id"fix-ci-pipelines-indexYorick Peterse2017-11-213-2/+42
* | | | | | | | | | | | Merge branch 'svg-color' into 'master'Annabel Dunstone Gray2017-11-2110-108/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | default fill color for SVGsSimon Knox2017-11-2110-108/+2
|/ / / / / / / / / / / /