Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Set head pipeline when creating merge requestsissue_32225_2 | Felipe Artur | 2017-05-29 | 2 | -1/+32 |
| | |||||
* | Sanity check pipeline sha before saving merge request head pipeline | Felipe Artur | 2017-05-23 | 1 | -1/+12 |
| | |||||
* | Merge branch 'issue_32225' into 'master' | Robert Speicher | 2017-05-23 | 12 | -50/+42 |
|\ | | | | | | | | | Add transient head_pipeline_of to pipeline factories See merge request !11566 | ||||
| * | Add transient head_pipeline_of to pipeline factoriesissue_32225 | Felipe Artur | 2017-05-22 | 12 | -50/+42 |
| | | |||||
* | | Merge branch 'zj-fix-pipeline-etag' into 'master' | Kamil Trzciński | 2017-05-23 | 4 | -0/+54 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix pipeline etag Closes #32658 See merge request !11615 | ||||
| * | | Test the ExpireJobCacheWorker and related changeszj-fix-pipeline-etag | Z.J. van de Weg | 2017-05-22 | 3 | -0/+43 |
| | | | | | | | | | | | | These were untested by the cherry picked commit. | ||||
| * | | Add Etag caching for Pipeline#Show action | Z.J. van de Weg | 2017-05-22 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | Due to a typo this was not actually the case. Now that is fixed and performance should improve because of this. | ||||
* | | | Merge branch 'add-unicode-trace-feature-test' into 'master' | Kamil Trzciński | 2017-05-23 | 2 | -42/+25 |
|\ \ \ | | | | | | | | | | | | | | | | | Add feature test with unicode trace See merge request !10736 | ||||
| * | | | Add feature test with unicode traceadd-unicode-trace-feature-test | Shinya Maeda | 2017-05-23 | 2 | -42/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 43e5bba774e9e383dd55c665e82f6fcfc4ebfc4f Author: Shinya Maeda <gitlab.shinyamaeda@gmail.com> Date: Mon Apr 17 17:28:44 2017 +0900 Add fix commit 09610eebdf22ad048812bb86022504b2ad917e19 Author: Shinya Maeda <gitlab.shinyamaeda@gmail.com> Date: Mon Apr 17 17:03:49 2017 +0900 Add trace test | ||||
* | | | | Merge branch '17489-hide-code-from-guests' into 'master' | Douwe Maan | 2017-05-23 | 1 | -3/+59 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide clone panel and file list when user is only a guest (with review comments addressed) Closes #30432, #3142, and #17489 See merge request !11631 | ||||
| * \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Valery Sizov | 2017-05-23 | 460 | -3369/+12556 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | 17489-hide-code-from-guests | ||||
| * | | | | | Fix review comment17489-hide-code-from-guests | Valery Sizov | 2017-05-23 | 1 | -15/+24 |
| | | | | | | |||||
| * | | | | | Hide clone panel and file list when user is only a guest | James Clark | 2017-05-07 | 1 | -1/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#17489 Fix test finding two of the same element Capybara will raise an exception because it finds two elements that match .nav-links. This means this test would fail, even if the page meets the conditions for passing the test. Add more tests for guest access | ||||
* | | | | | | Merge branch 'fix-backup-raketask' into 'master' | Timothy Andrew | 2017-05-23 | 1 | -11/+19 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing regex to backup manager Closes #32669 See merge request !11635 | ||||
| * | | | | | | Fix tests | Achilleas Pipinellis | 2017-05-23 | 1 | -14/+15 |
| | | | | | | | |||||
| * | | | | | | Add tests for removing old backups with the new timestamp | Achilleas Pipinellis | 2017-05-23 | 1 | -6/+13 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'winh-frontend-user-cache' into 'master' | Filipa Lacerda | 2017-05-23 | 2 | -0/+201 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce UsersCache for storing user entities in frontend See merge request !11404 | ||||
| * | | | | | | Add frontend UsersCache class (!11404)winh-frontend-user-cache | winh | 2017-05-23 | 1 | -0/+136 |
| | | | | | | | |||||
| * | | | | | | Extract Cache class from AjaxCache | winh | 2017-05-21 | 1 | -0/+65 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'fix/transient-service-template-spec' into 'master' | Rémy Coutable | 2017-05-23 | 1 | -4/+8 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix propagate service spec transient failure See merge request !11629 | ||||
| * | | | | | | | Fix propagate service spec transient failurefix/transient-service-template-spec | James Lopez | 2017-05-23 | 1 | -4/+8 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'winh-recent-searches-service-spec' into 'master' | Fatih Acet | 2017-05-23 | 1 | -22/+30 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Handle Promise rejections in RecentSearchesService spec See merge request !11206 | ||||
| * | | | | | | | Handle Promise rejections in RecentSearchesService spec (!11206)winh-recent-searches-service-spec | winh | 2017-05-11 | 1 | -22/+30 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'test-update_column_in_batches-with-sql-mysql' into 'master' | Rémy Coutable | 2017-05-23 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that Arel.sql would work for update_column_in_batches See merge request !11610 | ||||
| * | | | | | | | | Make sure that Arel.sql would work for update_column_in_batchestest-update_column_in_batches-with-sql-mysql | Lin Jen-Shin | 2017-05-23 | 1 | -0/+8 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'zj-sort-env-folders' into 'master' | Kamil Trzciński | 2017-05-23 | 1 | -7/+12 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort environments folders when opening them Closes #30814 See merge request !11436 | ||||
| * | | | | | | | | Improve test wording | Z.J. van de Weg | 2017-05-23 | 1 | -7/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | Make sorting difference clearer | Zeger-Jan van de Weg | 2017-05-19 | 1 | -4/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Sort environments folders when opening them | Z.J. van de Weg | 2017-05-17 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#30814 | ||||
* | | | | | | | | | Merge branch 'fix-retried-for-postgres' into 'master' | Kushal Pandya | 2017-05-23 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix migrations for older PostgreSQL versions Closes #32721 See merge request !11620 | ||||
| * | | | | | | | | Fix migrations for older PostgreSQL versionsfix-retried-for-postgres | Kamil Trzcinski | 2017-05-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Do not care about error when creating index on PostgreSQL - Test against PostgreSQL 9.2 | ||||
* | | | | | | | | | Merge branch 'prevent-project-transfer' into 'master' | Douwe Maan | 2017-05-23 | 2 | -0/+45 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent project transfer if a new group is not selected Closes #25455 See merge request !11214 | ||||
| * | | | | | | | | minor adjustments to the specs | Jose Ivan Vargas | 2017-05-22 | 2 | -11/+10 |
| | | | | | | | | | |||||
| * | | | | | | | | Renamed some messages and refactored the project_edit class to a function | Jose Ivan Vargas | 2017-05-22 | 2 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Prevent project transfer if a new group is not selected | Jose Ivan Vargas | 2017-05-22 | 2 | -0/+46 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'handle-transient-mr-query-count-spec' into 'master' | Douwe Maan | 2017-05-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle transient MR query count spec See merge request !11571 | ||||
| * | | | | | | | | Handle transient MR query count spechandle-transient-mr-query-count-spec | Oswaldo Ferreira | 2017-05-19 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '32418-make-link-to-self-less-obvious' into 'master' | Fatih Acet | 2017-05-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change links to issuable meta to black Closes #32418 See merge request !11505 | ||||
| * | | | | | | | | Fix specs32418-make-link-to-self-less-obvious | Annabel Dunstone Gray | 2017-05-19 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'adopt-es-module-syntax' into 'master' | Filipa Lacerda | 2017-05-22 | 54 | -150/+146 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Adopt ES module syntax See merge request !9567 | ||||
| * | | | | | | | | refactor instances of CJS module.exports to ES module syntax | Mike Greiling | 2017-05-16 | 2 | -6/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | fix eslint failures | Mike Greiling | 2017-05-16 | 4 | -4/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | fix implicit window object reference within gl_form_spec | Mike Greiling | 2017-05-16 | 1 | -6/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | update test_bundle to use ES module syntax | Mike Greiling | 2017-05-16 | 1 | -6/+8 |
| | | | | | | | | | |||||
| * | | | | | | | | update frontend specs to use ES module syntax | Mike Greiling | 2017-05-16 | 51 | -131/+129 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'change_pipelines_schedules_help_page_path' into 'master' | Rémy Coutable | 2017-05-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change pipelines schedules help page path See merge request !11592 | ||||
| * | | | | | | | | | Change pipelines schedules help page pathchange_pipelines_schedules_help_page_path | Achilleas Pipinellis | 2017-05-22 | 1 | -1/+1 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Respect the typo as rubocop said | Lin Jen-Shin | 2017-05-22 | 1 | -0/+0 |
| | | | | | | | | | |||||
* | | | | | | | | | Add a test to ensure this works on MySQL | Lin Jen-Shin | 2017-05-22 | 1 | -0/+17 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'zj-pipeline-json-performance' into 'master' | Kamil Trzciński | 2017-05-21 | 1 | -5/+33 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve pipeline size for query limit test Closes #31906 See merge request !11323 |