Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update awards_handler.jsaxios-post-awards-handler | Clement Ho | 2018-01-25 | 1 | -1/+1 |
| | |||||
* | Add internationalization | Clement Ho | 2018-01-24 | 1 | -1/+2 |
| | |||||
* | Remove new from flash | Clement Ho | 2018-01-24 | 1 | -2/+2 |
| | |||||
* | Get data from response | Clement Ho | 2018-01-24 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into axios-post-awards-handler | Clement Ho | 2018-01-24 | 186 | -3781/+4991 |
|\ | |||||
| * | Merge branch '40744-idempotent-ids' into 'master' | Robert Speicher | 2018-01-24 | 29 | -62/+86 |
| |\ | | | | | | | | | | | | | | | | | | | Use the DatabaseCleaner 'deletion' strategy instead of 'truncation' Closes #30783 See merge request gitlab-org/gitlab-ce!16516 | ||||
| | * | Avoid array indices to fixtures in JS specs | Nick Thomas | 2018-01-24 | 3 | -8/+11 |
| | | | |||||
| | * | Work around a bug in DatabaseCleaner when using the deletion strategy on MySQL | Nick Thomas | 2018-01-24 | 1 | -0/+15 |
| | | | |||||
| | * | Use the DatabaseCleaner 'deletion' strategy instead of 'truncation' | Nick Thomas | 2018-01-24 | 29 | -63/+69 |
| | | | |||||
| * | | Merge branch 'feature/migrate-get-lfs-ptrs-to-gitaly' into 'master' | Robert Speicher | 2018-01-24 | 4 | -22/+67 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Migrate .batch_lfs_pointers to Gitaly Closes gitaly#921 See merge request gitlab-org/gitlab-ce!16517 | ||||
| | * | | Migrate .batch_lfs_pointers to Gitalyfeature/migrate-get-lfs-ptrs-to-gitaly | Ahmad Sherif | 2018-01-24 | 4 | -22/+67 |
| | | | | | | | | | | | | | | | | Closes gitaly#921 | ||||
| * | | | Merge branch 'dm-project-system-hooks-in-transaction' into 'master' | Robert Speicher | 2018-01-24 | 4 | -3/+27 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | Execute system hooks after-commit when executing project hooks See merge request gitlab-org/gitlab-ce!16673 | ||||
| | * | | Execute system hooks after-commit when executing project hooksdm-project-system-hooks-in-transaction | Douwe Maan | 2018-01-24 | 4 | -3/+27 |
| | | | | |||||
| * | | | Merge branch '42361-workaround' into 'master'alejandro-test | Robert Speicher | 2018-01-24 | 1 | -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 tested | Rémy Coutable | 2018-01-24 | 1 | -0/+3 |
| | |/ | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Merge branch 'rc/move-one-spinach-job-to-rspec' into 'master' | Robert Speicher | 2018-01-24 | 1 | -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-rspec | Rémy Coutable | 2018-01-24 | 1 | -63/+63 |
| | |/ | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Merge branch 'feature/migrate-bundle-to-disk-to-gitaly' into 'master' | Robert Speicher | 2018-01-24 | 10 | -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-gitaly | Ahmad Sherif | 2018-01-24 | 10 | -10/+64 |
| | | | | | | | | | | | | | | | | Closes gitaly#929 | ||||
| * | | | Merge branch 'patch-28' into 'master' | Robert Speicher | 2018-01-24 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Fix typo in `.gitlab-ci.yml` heading See merge request gitlab-org/gitlab-ce!16668 | ||||
| | * | | | Fix typo in `.gitlab-ci.yml` heading | Mathijs de Kruyf | 2018-01-24 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge branch 'osw-updates-merge-status-on-api-actions' into 'master' | Douwe Maan | 2018-01-24 | 2 | -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 services | Oswaldo Ferreira | 2018-01-24 | 2 | -24/+0 |
| | | | | | |||||
| | * | | | Update changelogosw-updates-merge-status-on-api-actions | Oswaldo Ferreira | 2018-01-23 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Return more consistent values for merge_status on MR API | Oswaldo Ferreira | 2018-01-23 | 4 | -1/+39 |
| | | | | | |||||
| * | | | | Merge branch 'PNSalocin/gitlab-ce-24035-api-create-application' into 'master' | Rémy Coutable | 2018-01-24 | 6 | -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-application | Toon Claes | 2018-01-24 | 2 | -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 added | Toon Claes | 2018-01-24 | 2 | -1/+6 |
| | | | | | |||||
| | * | | | Add application create API | Nicolas MERELLI | 2018-01-24 | 6 | -0/+156 |
| | | | | | |||||
| * | | | | Merge branch 'groups-webpack-bundle' into 'master' | Filipa Lacerda | 2018-01-24 | 13 | -19/+24 |
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Added dispatcher imports for groups webpack bundle See merge request gitlab-org/gitlab-ce!16644 | ||||
| | * | | | fixed paginationgroups-webpack-bundle | Phil Hughes | 2018-01-23 | 1 | -3/+1 |
| | | | | | |||||
| | * | | | fixed group page specific JS | Phil Hughes | 2018-01-23 | 1 | -2/+0 |
| | | | | | |||||
| | * | | | Added dispatcher imports for groups webpack bundle | Phil Hughes | 2018-01-23 | 11 | -16/+25 |
| | | | | | |||||
| * | | | | Merge branch 'sh-fix-cross-site-forgery-errors' into 'master' | Rémy Coutable | 2018-01-24 | 1 | -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-errors | Stan Hu | 2018-01-23 | 1 | -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 Lacerda | 2018-01-24 | 5 | -21/+13 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added imports for dispatcher routes See merge request gitlab-org/gitlab-ce!16640 | ||||
| | * | | | | | added missing imports | Phil Hughes | 2018-01-24 | 1 | -0/+4 |
| | | | | | | | |||||
| | * | | | | | correctly imports performance bar | Phil Hughes | 2018-01-24 | 2 | -4/+2 |
| | | | | | | | |||||
| | * | | | | | Added imports for dispatcher routes | Phil Hughes | 2018-01-24 | 2 | -17/+7 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge branch 'winh-axios-mock-restore' into 'master' | Filipa Lacerda | 2018-01-24 | 10 | -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-restore | Winnie Hellmann | 2018-01-23 | 10 | -15/+15 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'rc/improve-setup-test-env' into 'master' | Grzegorz Bizon | 2018-01-24 | 3 | -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-env | Rémy Coutable | 2018-01-23 | 3 | -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 Bizon | 2018-01-24 | 2 | -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-files | Ahmad Sherif | 2018-01-23 | 2 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with missing side | ||||
| * | | | | | | | | Merge branch 'qa-deploy-key-factory-product' into 'master' | Grzegorz Bizon | 2018-01-24 | 4 | -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-product | Lin Jen-Shin | 2018-01-20 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, it's very hard to locate it. | ||||
| | * | | | | | | | | Scrap the deploy key title and match it in test | Lin Jen-Shin | 2018-01-20 | 3 | -10/+14 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch '32546-cannot-copy-paste-on-ios' into 'master' | Phil Hughes | 2018-01-24 | 2 | -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-ios | Mike Greiling | 2018-01-24 | 1 | -0/+5 |
| | | | | | | | | | |