summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Migrate restoring repo from bundle to Gitalyfeature/migrate-repo-restorer-to-gitalyAhmad Sherif2018-01-249-11/+80
| | | | Closes gitaly#946
* Merge branch '42361-workaround' into 'master'alejandro-testRobert Speicher2018-01-241-0/+3
|\ | | | | | | | | | | | | Resolve "Spec failure in ./spec/features/issues/spam_issues_spec.rb" Closes #42361 See merge request gitlab-org/gitlab-ce!16671
| * Workaround a recaptcha pop-up that cannot be testedRémy Coutable2018-01-241-0/+3
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'rc/move-one-spinach-job-to-rspec' into 'master'Robert Speicher2018-01-241-63/+63
|\ \ | | | | | | | | | | | | Remove one Spinach job and add one RSpec job See merge request gitlab-org/gitlab-ce!16675
| * | Remove one Spinach job and add one RSpec jobrc/move-one-spinach-job-to-rspecRémy Coutable2018-01-241-63/+63
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'feature/migrate-bundle-to-disk-to-gitaly' into 'master'Robert Speicher2018-01-2410-10/+64
|\ \ | | | | | | | | | | | | | | | | | | Migrate repository bundling to Gitaly Closes gitaly#929 See merge request gitlab-org/gitlab-ce!16563
| * | Migrate repository bundling to Gitalyfeature/migrate-bundle-to-disk-to-gitalyAhmad Sherif2018-01-2410-10/+64
| | | | | | | | | | | | Closes gitaly#929
* | | Merge branch 'patch-28' into 'master'Robert Speicher2018-01-241-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix typo in `.gitlab-ci.yml` heading See merge request gitlab-org/gitlab-ce!16668
| * | | Fix typo in `.gitlab-ci.yml` headingMathijs de Kruyf2018-01-241-1/+1
| |/ /
* | | Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'Douwe Maan2018-01-242-1/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Return more consistent values for merge_status on V4 MR APIs Closes #20639 See merge request gitlab-org/gitlab-ce!16626
| * | | Remove callback as we already update accordingly on servicesOswaldo Ferreira2018-01-242-24/+0
| | | |
| * | | Update changelogosw-updates-merge-status-on-api-actionsOswaldo Ferreira2018-01-231-1/+1
| | | |
| * | | Return more consistent values for merge_status on MR APIOswaldo Ferreira2018-01-234-1/+39
| | | |
* | | | Merge branch 'PNSalocin/gitlab-ce-24035-api-create-application' into 'master'Rémy Coutable2018-01-246-0/+165
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Add application create API Closes #24035 See merge request gitlab-org/gitlab-ce!16643
| * | | Make the exposing of the Application secret more explicitPNSalocin/gitlab-ce-24035-api-create-applicationToon Claes2018-01-242-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | To make it more clear to developers that the entity exposes the application secret, define a separate entity that only should be used when the secret is needed (probably only on creation).
| * | | Add documentation about when the application API was addedToon Claes2018-01-242-1/+6
| | | |
| * | | Add application create APINicolas MERELLI2018-01-246-0/+156
| | | |
* | | | Merge branch 'groups-webpack-bundle' into 'master'Filipa Lacerda2018-01-2413-19/+24
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Added dispatcher imports for groups webpack bundle See merge request gitlab-org/gitlab-ce!16644
| * | | fixed paginationgroups-webpack-bundlePhil Hughes2018-01-231-3/+1
| | | |
| * | | fixed group page specific JSPhil Hughes2018-01-231-2/+0
| | | |
| * | | Added dispatcher imports for groups webpack bundlePhil Hughes2018-01-2311-16/+25
| | | |
* | | | Merge branch 'sh-fix-cross-site-forgery-errors' into 'master'Rémy Coutable2018-01-241-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a blank JSON response for a missing .js file to prevent Rails CSRF errors Closes #40771 See merge request gitlab-org/gitlab-ce!16664
| * | | | Return a blank JSON response for a missing .js file to prevent Rails CSRF errorssh-fix-cross-site-forgery-errorsStan Hu2018-01-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default 404 handler would return the Content-Type format based on the given format extension. This would cause the Rails CSRF protection to flag an error, since the .js extension gets mapped to text/javascript format. Closes #40771
* | | | | Merge branch 'ph-even-more-dispatcher-imports' into 'master'Filipa Lacerda2018-01-245-21/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added imports for dispatcher routes See merge request gitlab-org/gitlab-ce!16640
| * | | | | added missing importsPhil Hughes2018-01-241-0/+4
| | | | | |
| * | | | | correctly imports performance barPhil Hughes2018-01-242-4/+2
| | | | | |
| * | | | | Added imports for dispatcher routesPhil Hughes2018-01-242-17/+7
| | |_|/ / | |/| | |
* | | | | Merge branch 'winh-axios-mock-restore' into 'master'Filipa Lacerda2018-01-2410-15/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use restore() instead of reset() for removing axios MockAdapter See merge request gitlab-org/gitlab-ce!16647
| * | | | | Use restore() instead of reset() for removing axios MockAdapterwinh-axios-mock-restoreWinnie Hellmann2018-01-2310-15/+15
| | | | | |
* | | | | | Merge branch 'rc/improve-setup-test-env' into 'master'Grzegorz Bizon2018-01-243-5/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed-up setup-test-env See merge request gitlab-org/gitlab-ce!16621
| * | | | | | Ensure Gitaly Ruby gems are installed using the correct Gemfile and at the ↵rc/improve-setup-test-envRémy Coutable2018-01-233-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correct location Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'fix/gitaly-can-be-merged-for-missing-conflict-files' into 'master'Grzegorz Bizon2018-01-242-1/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitalyClient::ConflictsService#conflicts? should return true for conflicts with missing side See merge request gitlab-org/gitlab-ce!16655
| * | | | | | | GitalyClient::ConflictsService#conflicts? should return true for conflicts ↵fix/gitaly-can-be-merged-for-missing-conflict-filesAhmad Sherif2018-01-232-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with missing side
* | | | | | | | Merge branch 'qa-deploy-key-factory-product' into 'master'Grzegorz Bizon2018-01-244-11/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scrap the deploy key title and match it in test See merge request gitlab-org/gitlab-ce!16554
| * | | | | | | | Add .qa-project-deploy-keys to locate itqa-deploy-key-factory-productLin Jen-Shin2018-01-202-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, it's very hard to locate it.
| * | | | | | | | Scrap the deploy key title and match it in testLin Jen-Shin2018-01-203-10/+14
| | | | | | | | |
* | | | | | | | | Merge branch '32546-cannot-copy-paste-on-ios' into 'master'Phil Hughes2018-01-242-0/+12
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Cannot copy/paste on iOS" Closes #32546 See merge request gitlab-org/gitlab-ce!15804
| * | | | | | | | add CHANGELOG.md entry for !1580432546-cannot-copy-paste-on-iosMike Greiling2018-01-241-0/+5
| | | | | | | | |
| * | | | | | | | disable CopyAsGFM on iOS due to bug in webkitMike Greiling2018-01-241-0/+7
| | | | | | | | |
* | | | | | | | | Merge branch '42251-explicit-timezone-for-karma' into 'master'Mike Greiling2018-01-232-0/+7
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set timezone for karma CI job to Etc/UTC (UTC+0) Closes #42251 See merge request gitlab-org/gitlab-ce!16602
| * | | | | | | | Set timezone for karma to UTCTakuya Noguchi2018-01-232-0/+7
| | | | | | | | |
* | | | | | | | | Merge branch '42340-ci-failing-on-mergerequestdiff-commits_count' into 'master'Stan Hu2018-01-231-0/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "CI failing on MergeRequestDiff#commits_count=" Closes #42340 See merge request gitlab-org/gitlab-ce!16653
| * | | | | | | | | Fix a migration spec messing up the MergeRequestDiff DB schema42340-ci-failing-on-mergerequestdiff-commits_countRémy Coutable2018-01-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'fix-gitlab-runner-2652' into 'master'Kamil Trzciński2018-01-231-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix docs for GIT_CHECKOUT Gitlab Runner configuration Closes gitlab-runner#2652 See merge request gitlab-org/gitlab-ce!16522
| * | | | | | | | | | Fix docs for GIT_CHECKOUT Gitlab Runner configurationTom Elliff2018-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should fix https://gitlab.com/gitlab-org/gitlab-runner/issues/2652
* | | | | | | | | | | Merge branch 'dm-push-rule-regexp-error-ce' into 'master'Douwe Maan2018-01-231-17/+21
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes to Gitlab::Checks::ChangeAccess from EE See merge request gitlab-org/gitlab-ce!16652
| * | | | | | | | | | Backport changes to Gitlab::Checks::ChangeAccess from EEDouwe Maan2018-01-231-17/+21
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'dispatcher-milestones-show-path' into 'master'Jacob Schatz2018-01-234-4/+22
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dispatcher milestones show path See merge request gitlab-org/gitlab-ce!16633
| * | | | | | | | | | | Refactor dispatcher milestones show pathdispatcher-milestones-show-pathClement Ho2018-01-224-4/+22
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'psimyn-webpack-bundle-env-metrics' into 'master'Phil Hughes2018-01-234-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove webpack bundle tag for monitoring:environments:metrics See merge request gitlab-org/gitlab-ce!16638
View Lorry Controller Status