summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Trigger rails5 tests either by variable or ref namejprovazn-rails-ciJan Provaznik2018-07-161-1/+3
* 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
* | | | | | Merge branch 'winh-upgrade-grape-path-helpers' into 'master'Stan Hu2018-07-122-1/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Upgrade grape-path-helpers to 1.0.6Winnie Hellmann2018-07-122-1/+6
* | | | | | Merge branch 'polish-severity-facets' into 'master'Mek Stittri2018-07-121-16/+18
|\ \ \ \ \ \
| * | | | | | Polish severity level facets furtherpolish-severity-facetsMek Stittri2018-07-111-16/+18
* | | | | | | Merge branch '48912-vue-files-without-tests-missing-in-coverage-report' into ...Annabel Gray2018-07-121-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Include Vue files that are not covered by tests in test coverage48912-vue-files-without-tests-missing-in-coverage-reportWinnie Hellmann2018-07-121-2/+2
* | | | | | | | Merge branch 'an/no-healthcheck-until-brooklyn' into 'master'Robert Speicher2018-07-123-64/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove healthchecks from prometheus endpointAndrew Newdigate2018-07-123-64/+11
|/ / / / / / / /
* | | | | | | | Merge branch 'backport-widget-changes' into 'master'Filipa Lacerda2018-07-123-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Backport mr widget changes from EEbackport-widget-changesAnnabel Dunstone Gray2018-07-123-2/+6
* | | | | | | | | Merge branch 'i18n-extract-app/views/admin-groups' into 'master'Rémy Coutable2018-07-127-43/+105
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | i18n: externalize strings from 'app/views/admin/groups'Tao Wang2018-07-137-43/+105
* | | | | | | | | | Merge branch '48241-fix-invalid-byte-sequence-in-qa' into 'master'Grzegorz Bizon2018-07-121-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Ensure Encoding.default_external is set to UTF-8 when running QA scenariosRémy Coutable2018-07-121-0/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'issue_47709' into 'master'Sean McGivern2018-07-124-0/+44
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |