summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Try to fence of gitaly n+1gitaly-mandatory-20180716-jvJacob Vosmaer2018-07-161-4/+6
* Migrate merge base, merged branches, write refJacob Vosmaer2018-07-161-69/+6
* Merge branch 'i18n-extract-app/views/doorkeeper' into 'master'Rémy Coutable2018-07-1613-61/+163
|\
| * i18n: externalize strings from 'app/views/doorkeeper'Tao Wang2018-07-1313-61/+163
* | Merge branch 'set-build-token-CN' into 'master'Rémy Coutable2018-07-161-1/+1
|\ \
| * | Add the CI Job trigger as the build triggerset-build-token-CNDJ Mountney2018-07-131-1/+1
* | | Merge branch 'mk/fix-flaky-protected-branch-expectations' into 'master'Rémy Coutable2018-07-165-44/+3
|\ \ \
| * | | Remove flaky and redundant expectationsmk/fix-flaky-protected-branch-expectationsMichael Kozono2018-07-135-44/+3
| |/ /
* | | Merge branch 'jprovazn-rails-ci' into 'master'Rémy Coutable2018-07-161-1/+3
|\ \ \
| * | | Trigger rails5 tests either by variable or ref namejprovazn-rails-ciJan Provaznik2018-07-161-1/+3
* | | | Merge branch 'sh-allow-danger-to-fail' into 'master'Rémy Coutable2018-07-161-0/+1
|\ \ \ \
| * | | | Allow Danger step to failsh-allow-danger-to-failStan Hu2018-07-141-0/+1
* | | | | Merge branch 'fix-danger' into 'master'Rémy Coutable2018-07-161-2/+4
|\ \ \ \ \
| * | | | | Use the correct exceptions to look for invalid YAML in Changelogsfix-dangerGabriel Mazetto2018-07-131-2/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch '49262-fix-autodevops-link-to-default-chart-docs' into 'master'Kamil Trzciński2018-07-161-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix link in help doc which was linking to old mono-repo, now in its own repo49262-fix-autodevops-link-to-default-chart-docsThong Kuah2018-07-161-1/+1
|/ / / /
* | | | Merge branch 'upgrade-frontend-deps' into 'master'Fatih Acet2018-07-142-965/+395
|\ \ \ \
| * | | | update webpack to v4.16Mike Greiling2018-07-142-965/+395
| | |/ / | |/| |
* | | | Merge branch '49128-improve-log-output-of-jasmine-toequal' into 'master'Mike Greiling2018-07-133-2/+18
|\ \ \ \
| * | | | improve log output of jasmine `toEqual` with nested objects/arrays49128-improve-log-output-of-jasmine-toequalLukas Eipert2018-07-113-2/+18
* | | | | Merge branch 'sh-backport-ee-logger-changes' into 'master'Douglas Barbosa Alexandre2018-07-131-0/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Backport logger changes from EEStan Hu2018-07-131-0/+8
|/ / / /
* | | | Merge branch '48673-lazy-load-performance-bar-in-frontend' into 'master'Mike Greiling2018-07-134-89/+115
|\ \ \ \ | |_|_|/ |/| | |
| * | | Lazy-load performance bar UI48673-lazy-load-performance-bar-in-frontendSean McGivern2018-07-134-89/+115
* | | | Merge branch 'ide-merge-requests-forks' into 'master'Filipa Lacerda2018-07-1312-20/+161
|\ \ \ \
| * | | | fixed test to correctly text relative URLside-merge-requests-forksPhil Hughes2018-07-132-13/+32
| * | | | fixed karma specsPhil Hughes2018-07-121-2/+9
| * | | | Allow collaboration with forks through the APIBob Van Landuyt2018-07-123-4/+81
| * | | | Allow merge requests from forks to be opened in Web IDEPhil Hughes2018-07-128-10/+48
| | |/ / | |/| |
* | | | Merge branch 'fix/gb/fix-project-settings-build-time-validation' into 'master'Kamil Trzciński2018-07-133-8/+17
|\ \ \ \
| * | | | Add changelog for maximum build timeout validationfix/gb/fix-project-settings-build-time-validationGrzegorz Bizon2018-07-121-0/+5
| * | | | Improve project build time setting validationGrzegorz Bizon2018-07-122-8/+12
* | | | | Merge branch '48894-fix-rss-button-interaction' into 'master'Annabel Gray2018-07-136-5/+16
|\ \ \ \ \
| * | | | | Add changelog entry48894-fix-rss-button-interactionKushal Pandya2018-07-131-0/+5
| * | | | | Fix RSS button interaction on Dashboard, Project and Group activitiesKushal Pandya2018-07-131-0/+7
| * | | | | Add flex to tabs containerKushal Pandya2018-07-131-1/+1
| * | | | | Update `.controls` positioningKushal Pandya2018-07-133-4/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sh-fix-stderr-pipe-consumption' into 'master'Yorick Peterse2018-07-135-7/+68
|\ \ \ \ \
| * | | | | Avoid process deadlock in popen by consuming input pipessh-fix-stderr-pipe-consumptionStan Hu2018-07-125-7/+68
* | | | | | Merge branch 'fix/gb/add-missing-before-sha-predefined-variable' into 'master'Kamil Trzciński2018-07-134-0/+9
|\ \ \ \ \ \
| * | | | | | Add changelog for predefined variable fixfix/gb/add-missing-before-sha-predefined-variableGrzegorz Bizon2018-07-121-0/+5
| * | | | | | Add missing `CI_COMMIT_BEFORE_SHA` predefined variableGrzegorz Bizon2018-07-123-0/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ide-pipeline-icon-open' into 'master'Filipa Lacerda2018-07-134-6/+49
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Open pipeline list panel when clicking CI icon in Web IDEide-pipeline-icon-openPhil Hughes2018-07-104-6/+49
* | | | | | Merge branch 'update-docs-board-features-tier' into 'master'Sean McGivern2018-07-131-5/+5
|\ \ \ \ \ \
| * | | | | | Update docs board features tierupdate-docs-board-features-tierVictor Wu2018-07-131-5/+5
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'gitaly-mandatory-20180712-jv' into 'master'Sean McGivern2018-07-134-200/+32
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix find_branch call sitesgitaly-mandatory-20180712-jvJacob Vosmaer2018-07-123-21/+3
| * | | | | whitespaceJacob Vosmaer2018-07-121-9/+9
| * | | | | Make more ref RPC's mandatoryJacob Vosmaer2018-07-122-172/+22
View Lorry Controller Status