summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | Merge branch 'docs-pages-index-proj-templates' into 'master'Marcia Ramos2019-03-073-82/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Move proj templates into default getting started guideMarcia Ramos2019-03-073-82/+78
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'sh-rugged-commit-is-ancestor' into 'master'Douwe Maan2019-03-074-3/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Bring back Rugged implementation of CommitIsAncestorStan Hu2019-03-044-3/+47
* | | | | | | | | | | | | | | | Merge branch 'docs-profiler-absolute-url' into 'master'Stan Hu2019-03-071-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Profiler only works with absolute URLs and pathsSean McGivern2019-03-071-0/+4
* | | | | | | | | | | | | | | | | Merge branch 'expand-diff-to-full-file' into 'master'Douwe Maan2019-03-0725-155/+945
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Move diff_line preparation into presenterMark Chao2019-03-074-86/+129
| * | | | | | | | | | | | | | | | | Add option to expand diff to full filePhil Hughes2019-03-0620-53/+685
| * | | | | | | | | | | | | | | | | Fix spec description and outdated commentsMark Chao2019-03-062-4/+2
| * | | | | | | | | | | | | | | | | Add full option for blob diff actionMark Chao2019-03-065-28/+145
* | | | | | | | | | | | | | | | | | Merge branch 'osw-merge-to-ref-changes-for-ci-team' into 'master'Douwe Maan2019-03-074-72/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Provide reliable source and target IDsOswaldo Ferreira2019-03-064-46/+71
| * | | | | | | | | | | | | | | | | | Ref merge does not fail upon FF config enabledOswaldo Ferreira2019-03-062-43/+2
* | | | | | | | | | | | | | | | | | | Merge branch 'gt-update-activity-filter-for-issues' into 'master'Douwe Maan2019-03-074-7/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Update event filter spec to included removed event typesGeorge Tsiolis2019-03-071-2/+5
| * | | | | | | | | | | | | | | | | | Add hard coded event type filterGeorge Tsiolis2019-03-071-1/+1
| * | | | | | | | | | | | | | | | | | Remove extra empty lines in activity specGeorge Tsiolis2019-03-071-2/+0
| * | | | | | | | | | | | | | | | | | Update event filter specGeorge Tsiolis2019-03-071-5/+2
| * | | | | | | | | | | | | | | | | | Update activity specGeorge Tsiolis2019-03-071-2/+17
| * | | | | | | | | | | | | | | | | | Update activity filter for issuesGeorge Tsiolis2019-03-072-1/+6
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'zj-gitaly-1.25' into 'master'Douwe Maan2019-03-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Upgrade GITALY_SERVER_VERSION for v1.25.0Zeger-Jan van de Weg2019-03-071-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'per-test-on-master' into 'master'Rémy Coutable2019-03-071-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Sourcing the script in review-deploy jobRamya Authappan2019-03-071-0/+1
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'ce-9486-insights-config-file' into 'master'Rémy Coutable2019-03-071-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Port EE insights configuration partial renderingLin Jen-Shin2019-03-061-0/+2
| | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'fl-update-gitlab-ui' into 'master'Phil Hughes2019-03-072-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into fl-update-gitlab-uiFilipa Lacerda2019-03-072-5/+5
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'sh-optimize-todos-api' into 'master'Sean McGivern2019-03-079-10/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Significantly reduce N+1 queries in /api/v4/todos endpointStan Hu2019-03-069-10/+103
* | | | | | | | | | | | | | | | | | Merge branch '10095-job-getters' into 'master'Phil Hughes2019-03-074-0/+81
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Moves shared quota getter into CEFilipa Lacerda2019-03-074-0/+81
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch '58613-protected-branches-error' into 'master'Lin Jen-Shin2019-03-072-4/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Move empty_repo check on its own58613-protected-branches-errorPatrick Bajao2019-03-072-19/+24
| * | | | | | | | | | | | | | | | | | Allow protected branch creation for empty projectPatrick Bajao2019-03-072-1/+16
| | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'fix-group-without-owner' into 'master'Sean McGivern2019-03-074-0/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | fix group without owner after transferPeter Marko2019-03-014-0/+45
* | | | | | | | | | | | | | | | | | | Merge branch 'patch-48' into 'master'Kamil Trzciński2019-03-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Change 11.9 for 11.7 in include external filesDavid Broin2019-03-071-1/+1
* | | | | | | | | | | | | | | | | | | | Merge branch 'ce-9929-cluster-monitoring-is-broken-after-echarts' into 'master'Clement Ho2019-03-075-59/+108
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Fix cluster health chartsAdriel Santiago2019-03-075-59/+108
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch '52459-display-job-names-consistently-on-pipelines-and-environme...Phil Hughes2019-03-075-10/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Use gitlab-ci job name in environment dropdownMiranda Fluharty2019-03-075-10/+14
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'tz-reorganise-digests-json' into 'master'Phil Hughes2019-03-071809-182/+11113
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Moved all emojis to the public folderTim Zallmann2019-03-071809-182/+11113
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch '8661-add-ci-template-for-dependency-scanning-ce' into 'master'Kamil Trzciński2019-03-072-5/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Add Dependency Scanning vendored template for EEVictor Zagorodny2019-03-072-5/+44
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch '58369-hide-squash-commit' into 'master'Phil Hughes2019-03-074-5/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Added a condition on squash message displayNatalia Tepluhina2019-03-074-5/+23
|/ / / / / / / / / / / / / / / / / / / /