Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Replace 'starred_projects.feature' spinach test with an rspec analog23036-replace-all-spinach-tests-with-rspec-feature-tests | blackst0ne | 2017-05-28 | 3 | -13/+17 |
| | |||||
* | Merge branch 'patch-23' into 'master' | Kamil Trzciński | 2017-05-27 | 1 | -3/+3 |
|\ | | | | | | | | | | | | | Replace "build" with "job" Closes #32994 See merge request !11746 | ||||
| * | Replace "build" with "job" | Fabio Busatto | 2017-05-26 | 1 | -3/+3 |
| | | | | | | Close #32994 | ||||
* | | Merge branch 'add-relevant-ee-spec' into 'master' | Stan Hu | 2017-05-27 | 1 | -0/+25 |
|\ \ | |/ |/| | | | | | Add missing project import job example from gitlab-ee See merge request !7106 | ||||
| * | Update spec to match latest EE changes | Stan Hu | 2017-05-26 | 1 | -2/+7 |
| | | |||||
| * | Add missing project import job example from gitlab-ee | Alejandro Rodríguez | 2017-05-26 | 1 | -0/+20 |
| | | |||||
* | | Merge branch 'apply-same-responsive-notes-to-parallel-diff' into 'master' | Annabel Dunstone Gray | 2017-05-26 | 4 | -33/+42 |
|\ \ | | | | | | | | | | | | | Apply responsive note styles to parallel diffs See merge request !11701 | ||||
| * | | Apply responsive note styles to parallel diffsapply-same-responsive-notes-to-parallel-diff | Eric Eastwood | 2017-05-26 | 4 | -33/+42 |
| | | | | | | | | | | | | | | | Fix inspired while working on https://gitlab.com/gitlab-org/gitlab-ce/issues/32801 | ||||
* | | | Merge branch 'enable-duplicate-property-scss-lint' into 'master' | Clement Ho | 2017-05-26 | 10 | -9/+3 |
|\ \ \ | | | | | | | | | | | | | | | | | Enable DuplicateProperty scss-lint See merge request !11722 | ||||
| * | | | Enable DuplicateProperty scss-lint | Annabel Dunstone Gray | 2017-05-26 | 10 | -9/+3 |
|/ / / | |||||
* | | | Merge branch ↵ | Fatih Acet | 2017-05-26 | 11 | -12/+102 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' into 'master' Disable "Remove source branch" in MR Widget for users who can't remove, and re-add checkbox to MR form Closes #32447 and #32907 See merge request !11558 | ||||
| * | | Update MWPS feature spec per change to remove source branch default.32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project | Bryce Johnson | 2017-05-25 | 1 | -2/+2 |
| | | | |||||
| * | | Fallback to false when remove_source_branch is null. | Bryce Johnson | 2017-05-25 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch ↵ | Bryce Johnson | 2017-05-25 | 2 | -1/+3 |
| |\ \ | | | | | | | | | | | | | '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' of gitlab.com:gitlab-org/gitlab-ce into 32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project | ||||
| | * | | Expose remove_source_branch boolean/null | Oswaldo Ferreira | 2017-05-24 | 2 | -1/+3 |
| | | | | |||||
| * | | | Update shouldRemoveSourceBranch against API entity changes. | Bryce Johnson | 2017-05-25 | 1 | -3/+1 |
| |/ / | |||||
| * | | Set up merge request from fork more simply. | Bryce Johnson | 2017-05-24 | 1 | -10/+2 |
| | | | |||||
| * | | Remove spec from created_from_fork_spec. | Bryce Johnson | 2017-05-24 | 1 | -15/+0 |
| | | | |||||
| * | | Move spec and add one for merge button not disabled. | Bryce Johnson | 2017-05-24 | 1 | -0/+29 |
| | | | |||||
| * | | Add spec for disabled Remove source branch checkbox. | Bryce Johnson | 2017-05-23 | 1 | -0/+15 |
| | | | |||||
| * | | Set merge params to force_remove_source_branch by default. | Bryce Johnson | 2017-05-23 | 1 | -2/+4 |
| | | | |||||
| * | | Update spinach specs to explicitly check Remove Source Branch. | Bryce Johnson | 2017-05-23 | 2 | -2/+7 |
| | | | |||||
| * | | Shush rubocop. | Bryce Johnson | 2017-05-22 | 1 | -1/+0 |
| | | | |||||
| * | | Don't use getElementById in specs. | Bryce Johnson | 2017-05-22 | 1 | -2/+2 |
| | | | |||||
| * | | Shush eslint. | Bryce Johnson | 2017-05-22 | 1 | -1/+1 |
| | | | |||||
| * | | Upgrade Remove Source Branch checkbox UX. | Bryce Johnson | 2017-05-22 | 5 | -5/+68 |
| | | | |||||
* | | | Merge branch 'dm-consistent-note-paddings' into 'master' | Annabel Dunstone Gray | 2017-05-26 | 8 | -54/+75 |
|\ \ \ | | | | | | | | | | | | | | | | | More consistent padding of notes, system notes, and note form See merge request !11720 | ||||
| * | | | More consistent padding of notes, system notes, and note form | Douwe Maan | 2017-05-26 | 8 | -54/+75 |
|/ / / | |||||
* | | | Merge branch 'dm-dependency-value-regex' into 'master' | Grzegorz Bizon | 2017-05-26 | 3 | -6/+15 |
|\ \ \ | | | | | | | | | | | | | | | | | Don't allow spaces in dependency linker value regex See merge request !11721 | ||||
| * | | | Add specdm-dependency-value-regex | Douwe Maan | 2017-05-26 | 1 | -1/+10 |
| | | | | |||||
| * | | | Don't allow spaces in dependency linker value regex | Douwe Maan | 2017-05-25 | 2 | -5/+5 |
| | | | | |||||
* | | | | Merge branch ↵ | Grzegorz Bizon | 2017-05-26 | 2 | -22/+78 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31459-fix-transient-error-caused-by-small-timeout-also-adapt-tests-to-work-locally-correctly' into 'master' Fix transient CI errors by increasing command execution timeouts from 1s to 30s Closes #31459 See merge request !11420 | ||||
| * | | | | Move helpers to spec file, use const's instead of helper methods | Pawel Chojnacki | 2017-05-25 | 3 | -35/+26 |
| | | | | | |||||
| * | | | | Make the test cases more readable and fix to_s coercion problem | Pawel Chojnacki | 2017-05-23 | 1 | -19/+26 |
| | | | | | |||||
| * | | | | Stop skipping tests if local dependencies are not found | Pawel Chojnacki | 2017-05-22 | 2 | -9/+1 |
| | | | | | |||||
| * | | | | Fix transient CI errors by increasing command execution timeouts from 1s to 30s | Pawel Chojnacki | 2017-05-17 | 3 | -7/+73 |
| | | | | | | | | | | | | | | | | | | | | + actually make local tests correctly detect wether 'timeout' or 'gtimeout' is available | ||||
* | | | | | Merge branch 'ci-build-pipeline-header-vue' into 'master' | Phil Hughes | 2017-05-26 | 6 | -0/+352 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Creates CI Header component to use in pipelines and job details pages See merge request !11726 | ||||
| * | | | | | Creates CI Header component to use in pipelines and job details pages | Filipa Lacerda | 2017-05-26 | 6 | -0/+352 |
|/ / / / / | |||||
* | | | | | Merge branch 'enable-final-newline' into 'master' | Clement Ho | 2017-05-26 | 2 | -34/+34 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Enable final newline See merge request !11723 | ||||
| * | | | | | Enable final newline ruleenable-final-newline | Annabel Dunstone Gray | 2017-05-26 | 2 | -34/+34 |
| | | | | | | |||||
* | | | | | | Merge branch 'dm-consistent-last-push-event' into 'master' | Robert Speicher | 2017-05-26 | 22 | -75/+68 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consistently display last push event widget See merge request !11585 | ||||
| * | | | | | | Fix specdm-consistent-last-push-event | Douwe Maan | 2017-05-26 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Make section connect with window border without extra padding | Douwe Maan | 2017-05-25 | 9 | -29/+35 |
| | | | | | | | |||||
| * | | | | | | Kill copy button with 🔥 | Douwe Maan | 2017-05-25 | 1 | -4/+2 |
| | | | | | | | |||||
| * | | | | | | Consistently display last push event widget | Douwe Maan | 2017-05-25 | 20 | -57/+46 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'fix_counter_cache_invalidation' into 'master' | Douwe Maan | 2017-05-26 | 12 | -2/+46 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix counter cache invalidation Closes #32854 and #32870 See merge request !11736 | ||||
| * | | | | | | Fix counters cache invalidation for Issues and Merge Requests | Valery Sizov | 2017-05-26 | 11 | -0/+44 |
| | | | | | | | |||||
| * | | | | | | Set "expire_in" for counters cache | Valery Sizov | 2017-05-26 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Merge branch '32851-update-postgres-requirements' into 'master' | Douwe Maan | 2017-05-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Postgresql 9.2 is the minimum version from GitLab 9.3, not 9.0 See merge request !11737 | ||||
| * | | | | | | | Postgresql 9.2 is the minimum version from GitLab 9.3, not 9.0 | Nick Thomas | 2017-05-26 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | |