summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* WIP: Adding LDAP login feature specsjej/refactor-omniauth-controllerJames Edwards-Jones2018-02-173-10/+70
|
* Continued refactoring OmniauthCallbacksControllerJames Edwards-Jones2018-02-1718-158/+339
| | | | | Extracted LDAP omniauth callback to its own controller Added tests for LDAP login
* Refactor OmniauthCallbacksController to remove duplicationJames Edwards-Jones2018-02-177-30/+113
|
* Merge branch '39917-revert-this-merge-request-text' into 'master'Fatih Acet2018-01-242-0/+8
|\ | | | | | | | | | | | | Resolve ""Revert this merge request" modal has confusing string" Closes #39917 See merge request gitlab-org/gitlab-ce!16611
| * Updates `Revert this merge request` textJacopo2018-01-242-0/+8
| | | | | | | | Changes the text in the Revert merge request modal: `Start a new merge request with these changes` => `Start a new merge request with the revert changes`.
* | Merge branch 'fix/add-formatted-data-to-wiki-page' into 'master'Robert Speicher2018-01-242-1/+13
|\ \ | | | | | | | | | | | | | | | | | | Add formatted_data attribute to Git::WikiPage Closes #39805 See merge request gitlab-org/gitlab-ce!16682
| * | Add formatted_data attribute to Git::WikiPageAhmad Sherif2018-01-242-1/+13
| |/ | | | | | | Related to #39805
* | Merge branch 'search-100' into 'master'Yorick Peterse2018-01-2413-31/+153
|\ \ | | | | | | | | | | | | Use limit for search count queries See merge request gitlab-org/gitlab-ce!16502
| * | Use limit for search count queriessearch-100Jan Provaznik2018-01-2313-31/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search query is especially slow if a user searches a generic string which matches many records, in such case search can take tens of seconds or time out. To speed up the search query, we search only for first 1000 records, if there is >1000 matching records we just display "1000+" instead of precise total count supposing that with such amount the exact count is not so important for the user. Because for issues even limited search was not fast enough, 2-phase approach is used for issues: first we use simpler/faster query to get all public issues, if this exceeds the limit, we just return the limit. If the amount of matching results is lower than limit, we re-run more complex search query (which includes also confidential issues). Re-running the complex query should be fast enough in such case because the amount of matching issues is lower than limit. Because exact total_count is now limited, this patch also switches to to "prev/next" pagination. Related #40540
* | | Merge branch '40744-idempotent-ids' into 'master'Robert Speicher2018-01-2429-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 specsNick Thomas2018-01-243-8/+11
| | | |
| * | | Work around a bug in DatabaseCleaner when using the deletion strategy on MySQLNick Thomas2018-01-241-0/+15
| | | |
| * | | Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'Nick Thomas2018-01-2429-63/+69
| | | |
* | | | Merge branch 'feature/migrate-get-lfs-ptrs-to-gitaly' into 'master'Robert Speicher2018-01-244-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-gitalyAhmad Sherif2018-01-244-22/+67
| | |_|/ | |/| | | | | | | | | | Closes gitaly#921
* | | | Merge branch 'dm-project-system-hooks-in-transaction' into 'master'Robert Speicher2018-01-244-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-transactionDouwe Maan2018-01-244-3/+27
| | | |
* | | | 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
View Lorry Controller Status