summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add the CI Job trigger as the build triggerset-build-token-CNDJ Mountney2018-07-131-1/+1
| | | | For building CNG images on tag
* Merge branch 'ide-merge-requests-forks' into 'master'Filipa Lacerda2018-07-1312-20/+161
|\ | | | | | | | | | | | | Allow merge requests from forks to be opened in Web IDE Closes #47460 See merge request gitlab-org/gitlab-ce!20521
| * fixed test to correctly text relative URLside-merge-requests-forksPhil Hughes2018-07-132-13/+32
| | | | | | | | doesnt add query param if source & target projects match
| * fixed karma specsPhil Hughes2018-07-121-2/+9
| |
| * Allow collaboration with forks through the APIBob Van Landuyt2018-07-123-4/+81
| | | | | | | | | | | | | | These APIs are used by the web IDE. They need to be on par with git & web access, allowing edits from maintainers to forks with merge requests that allow access.
| * Allow merge requests from forks to be opened in Web IDEPhil Hughes2018-07-128-10/+48
| | | | | | | | Closes #47460
* | Merge branch 'fix/gb/fix-project-settings-build-time-validation' into 'master'Kamil Trzciński2018-07-133-8/+17
|\ \ | | | | | | | | | | | | | | | | | | Improve project build time setting validation Closes #44443 See merge request gitlab-org/gitlab-ce!20591
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix RSS button interaction on Dashboard, Project and Group activities Closes #48894 See merge request gitlab-org/gitlab-ce!20549
| * | | 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 pipes Closes gitlab-ee#6895 See merge request gitlab-org/gitlab-ce!20600
| * | | | Avoid process deadlock in popen by consuming input pipessh-fix-stderr-pipe-consumptionStan Hu2018-07-125-7/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A process that spews a lot of output to stderr or stdout could stall out due to the pipe buffer being full. As described in https://bugs.ruby-lang.org/issues/9082, we can use the trick used in Ruby's capture3 function to read the pipes in separate threads. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6895
* | | | | Merge branch 'fix/gb/add-missing-before-sha-predefined-variable' into 'master'Kamil Trzciński2018-07-134-0/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing `CI_COMMIT_BEFORE_SHA` predefined variable Closes #43365 See merge request gitlab-org/gitlab-ce!20594
| * | | | | 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 IDE Closes #47843 See merge request gitlab-org/gitlab-ce!20516
| * | | | | Open pipeline list panel when clicking CI icon in Web IDEide-pipeline-icon-openPhil Hughes2018-07-104-6/+49
| | | | | | | | | | | | | | | | | | | | | | | | Closes #47843
* | | | | | Merge branch 'update-docs-board-features-tier' into 'master'Sean McGivern2018-07-131-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs board features tier See merge request gitlab-org/gitlab-ce!20602
| * | | | | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make more ref RPC's mandatory Closes gitaly#526, gitaly#965, gitaly#476, and gitaly#474 See merge request gitlab-org/gitlab-ce!20592
| * | | | | 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.6 See merge request gitlab-org/gitlab-ce!20601
| * | | | | 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 further See merge request gitlab-org/gitlab-ce!20572
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Include Vue files without tests in coverage report Closes #48912 See merge request gitlab-org/gitlab-ce!20431
| * | | | | | | 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 endpoint Closes #49112 See merge request gitlab-org/gitlab-ce!20565
| * | | | | | | | 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 EE See merge request gitlab-org/gitlab-ce!20598
| * | | | | | | | 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' See merge request gitlab-org/gitlab-ce!19924
| * | | | | | | | | i18n: externalize strings from 'app/views/admin/groups'Tao Wang2018-07-137-43/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com>
* | | | | | | | | | Merge branch '48241-fix-invalid-byte-sequence-in-qa' into 'master'Grzegorz Bizon2018-07-121-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "QA: False failure on QA test "Push to protected branch when allowed" during staging failover rehearsal" Closes #48241 See merge request gitlab-org/gitlab-ce!20561
| * | | | | | | | | | Ensure Encoding.default_external is set to UTF-8 when running QA scenariosRémy Coutable2018-07-121-0/+2
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'issue_47709' into 'master'Sean McGivern2018-07-124-0/+44
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to toggle notifications for issues due soon Closes #47709 See merge request gitlab-org/gitlab-ce!20530
| * | | | | | | | | Allow to toggle notifications for issues due soonFelipe Artur2018-07-124-0/+44
| | | | | | | | | |
* | | | | | | | | | Merge branch 'vuex-test-helper-improvements' into 'master'Phil Hughes2018-07-1210-88/+233
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vuex test helper improvements Closes #44912, #44919, and #44920 See merge request gitlab-org/gitlab-ce!20513
| * | | | | | | | | | Vuex test helper improvementsLukas Eipert2018-07-1210-88/+233
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'qa-fix-timestamp' into 'master'Grzegorz Bizon2018-07-121-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [QA] Fix duplicate year in namespace name See merge request gitlab-org/gitlab-ce!20581
| * | | | | | | | | | [QA] Fix duplicate year in namespace nameqa-fix-timestampRémy Coutable2018-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch ↵Grzegorz Bizon2018-07-121-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '49139-sleep-before-installing-tiller-to-prevent-race-condition' into 'master' Resolve "Installing helm tiller sometimes fails with no api token found" Closes #49139 See merge request gitlab-org/gitlab-ce!20580
| * | | | | | | | | | | Add sleep to QA test before installing tiller49139-sleep-before-installing-tiller-to-prevent-race-conditionDylan Griffith2018-07-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we ocassionally see a race condition error: No API token found for service account "default", retry after the token is automatically created and added to the service account Waiting 10 seconds should remove this risk.
* | | | | | | | | | | | Merge branch 'fix-performance-problem-of-tags-query' into 'master'Yorick Peterse2018-07-122-4/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix performance problem of tags query Closes gitlab-com/infrastructure#4550 See merge request gitlab-org/gitlab-ce!20555