summaryrefslogtreecommitdiff
path: root/features/steps/project
Commit message (Collapse)AuthorAgeFilesLines
* Updated snippets testssnippets-uiPhil Hughes2016-05-191-2/+2
|
* Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-131-1/+1
|
* Merge branch 'hook-docs-behavior' into 'master' Robert Speicher2016-05-111-1/+1
|\ | | | | | | | | | | | | | | Improve documentation and web test for web hooks Tips and documentation of actual hook behavior. Improved user feedback when testing hooks via the web UI. See merge request !4015
| * Fix test failuresJacob Vosmaer2016-05-091-1/+1
| |
* | Add integration specs for tagsRémy Coutable2016-05-101-90/+0
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Backport changes from gitlab-org/gitlab-ee!372rs-backport-ee-372Robert Speicher2016-05-041-25/+1
| | | | | | | | Mostly replaces several Spinach tests with RSpec Feature tests.
* | Use Rugged's TagCollection#create instead of gitlab-shell's ↵Rémy Coutable2016-05-041-2/+2
|/ | | | | | Repository#add_tag for better performance Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'project-webhooks-ui' into 'master' Jacob Schatz2016-04-281-2/+2
|\ | | | | | | | | | | | | | | | | | | | | Project webhooks updated UI Closes #13993 ![Screen_Shot_2016-04-26_at_10.55.52](/uploads/684f79be18f8a69e9b5cbcca2c9b20e8/Screen_Shot_2016-04-26_at_10.55.52.png) ![Screen_Shot_2016-04-26_at_10.55.37](/uploads/9b9f3a8a243dec955f23967e20ec514f/Screen_Shot_2016-04-26_at_10.55.37.png) See merge request !3922
| * Updated testsproject-webhooks-uiPhil Hughes2016-04-261-2/+2
| |
* | Updated tests for deploy keysproject-deploy-keys-uiPhil Hughes2016-04-251-7/+7
|/
* Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński2016-04-211-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci::Commit becomes a Pipeline object 1. Ci::Commit receives context: ref, :tag. 1. One Ci::Commit describes a one Pipeline 1. Pipeline is created from `.gitlab-ci.yml` 1. Pipeline is a ordered group of builds 1. We test MR against Pipeline 1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future) 1. We add a Pipeline Hook that will be triggered on Pipeline status change (future) 1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future) After merging that I'll prepare a separate MR that will unify naming, database columns, table names: ``` Ci::Commit -> Pipeline Ci::Build -> Build CommitStatus -> Job GenericCommitStatus -> ExternalJob ci_commits -> pipelines ci_builds -> jobs ``` This MR implements first 5 points. This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149. See merge request !3653
| * Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-163-5/+5
| |\ | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * \ Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-113-15/+22
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/commits/_commit.html.haml
| * | | Fix specsKamil Trzcinski2016-04-111-1/+1
| | | |
* | | | Merge branch 'multi-filter-labels' into 'master' Jacob Schatz2016-04-201-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mutliple label filter Fixes #989 See merge request !3438
| * | | | fix failing testsArinde Eniola2016-04-141-0/+4
| | |/ / | |/| |
* | | | Merge branch 'license-templates-and-api-12804' into 'master' Robert Speicher2016-04-201-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | License templates when creating/editing a LICENSE file Closes #12804 See merge request !3660
| * | | | Fix specsRémy Coutable2016-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Fix features specs (hopefully)Rémy Coutable2016-04-181-1/+1
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'mr-formatting' into 'master' Robert Speicher2016-04-191-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use ! rather than # for merge request references Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278 See merge request !3740
| * | | | format merge request references properlyBen Bodenmiller2016-04-181-1/+1
| |/ / /
* | | | Remove persistent XSS vulnerability in `commit_person_link` helperRobert Speicher2016-04-171-1/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we were incorrectly supplying the tooltip title as `data-original-title` (which Bootstrap's Tooltip JS automatically applies based on the `title` attribute; we should never be setting it directly), the value was being passed through as-is. Instead, we should be supplying the normal `title` attribute and letting Rails escape the value, which also negates the need for us to call `sanitize` on it. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15126
* | | Removed references to subscribe-button CSS classPhil Hughes2016-04-123-5/+5
|/ / | | | | | | | | | | These were being blocked by adblocks Closes #15043
* | Merge branch 'mr-ui-update' into 'master' Jacob Schatz2016-04-113-15/+22
|\ \ | |/ |/| | | | | | | | | | | | | | | | | Updated UI for new merge request Closes #2540 ![Screen_Shot_2016-03-29_at_12.53.18](/uploads/426e603675171f0dc4e0af83c7762eba/Screen_Shot_2016-03-29_at_12.53.18.png) ![Screen_Shot_2016-03-29_at_12.53.13](/uploads/645ad7955acfb9f7693245fcc048ee49/Screen_Shot_2016-03-29_at_12.53.13.png) See merge request !3228
| * Addressed feedbackPhil Hughes2016-04-111-1/+0
| | | | | | | | Removed important from css
| * Fixed testsPhil Hughes2016-04-071-1/+1
| |
| * Fixed buildsPhil Hughes2016-04-062-11/+19
| |
| * Use new dropdowns for MR comparePhil Hughes2016-04-061-2/+2
| |
| * Fixed failing testsPhil Hughes2016-04-061-2/+2
| |
* | Merge branch 'redesign_labels_page' into 'master' Jacob Schatz2016-04-101-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redesign labels page closes #14227 ## Desktop ![Screen_Shot_2016-04-05_at_7.19.37_PM](/uploads/a52b764565b6e2739fb6932178f8bde5/Screen_Shot_2016-04-05_at_7.19.37_PM.png) ## Mobile ![Screen_Shot_2016-04-04_at_6.40.57_PM](/uploads/9804b074126fcdb6755918e9f4c472a7/Screen_Shot_2016-04-04_at_6.40.57_PM.png) See merge request !3507
| * | fix the failing tests and some changesArinde Eniola2016-04-061-1/+1
| |/
* | Revert "Merge branch 'new-navigation-prototype' into 'master'"Jacob Schatz2016-04-073-7/+11
|/ | | This reverts merge request !3494
* Wrap images in discussions and wikis with a link to the image source using ↵connorshea2016-04-041-1/+1
| | | | | | | | ImageLinkFilter. Resolves #14411. See merge request !3464
* Merge branch 'new-navigation-prototype' into 'master' Dmitriy Zaporozhets2016-04-023-11/+7
|\ | | | | | | | | | | | | Two level hierarchy in navigation sidebar Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3494
| * Fix milestones tab active state and testsnew-navigation-prototypeDmitriy Zaporozhets2016-04-023-3/+5
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix some active tab tests that are broken because of 2 level sidebarDmitriy Zaporozhets2016-04-011-1/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Remove tests with back buttonDmitriy Zaporozhets2016-04-011-8/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Tests updatePhil Hughes2016-03-311-4/+4
|/
* Merge branch 'issues-show-performance' into 'master' Robert Speicher2016-03-211-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | Improve performance of viewing individual issues This MR does two things: 1. `Issue#related_branches` no longer performs Git operations that aren't needed 2. The output of `Repository#exists?` is now cached and flushed properly Combined these two changes should further cut down the amount of Git operations performed when viewing individual issues (and possibly other pages). See merge request !3296
| * Create SSH keys for SSH clone Spinach testsissues-show-performanceYorick Peterse2016-03-211-0/+1
| | | | | | | | | | | | | | | | | | | | These tests would check if the "This project is empty" banner would contain SSH clone URLs. Oddly enough this should have never passed (as far as I can tell) as SSH clone URLs in this banner are _only_ displayed if the current user has at least 1 SSH key attached. Since the tests never seem to create any they never should have passed, yet somehow they did. To solve this the Spinach tests in question now ensure at least 1 SSH key is present.
| * Create repositories in Spinach issues testsYorick Peterse2016-03-191-1/+1
| | | | | | | | | | | | Similar to ad90dba5185e30883d5ad6008c166b0df0108ebf we always have a repository in the real world, so let's also create one in our Spinach tests.
* | Fix specs and remove unnecessary console.logStan Hu2016-03-201-2/+2
|/
* Improve award emoji test reliability by checking that the emoji is displayedStan Hu2016-03-171-0/+4
| | | | before the search field is focused
* Reuse `no_cache_headers` method in badges controllerGrzegorz Bizon2016-03-171-1/+1
|
* Improving the original label-subscribing implementationRémy Coutable2016-03-151-4/+4
| | | | | | | 1. Make the "subscribed" text in Issuable sidebar reflect the labels subscription status 2. Current user mut be logged-in to toggle issue/MR/label subscription
* Original implementation to allow users to subscribe to labelsTimothy Andrew2016-03-151-0/+34
| | | | | | | | | | | | | | | | | | 1. Allow subscribing (the current user) to a label - Refactor the `Subscription` coffeescript class - The main change is that it accepts a container, and conducts all DOM queries within its scope. We need this because the labels page has multiple instances of `Subscription` on the same page. 2. Creating an issue or MR with labels notifies users subscribed to those labels - Label `has_many` subscribers through subscriptions. 3. Adding a label to an issue or MR notifies users subscribed to those labels - This only applies to subscribers of the label that has just been added, not all labels for the issue.
* Merge branch 'fix/13928-wrong-iid-of-max-iid' into 'master' Douwe Maan2016-03-151-0/+20
|\ | | | | | | | | | | | | | | Fixes "iid of max iid" in Issuable sidebar for merged MR Fixes #13928. See merge request !3046
| * Fixes "iid of max iid" in Issuable sidebar for merged MRfix/13928-wrong-iid-of-max-iidRémy Coutable2016-03-081-0/+20
| | | | | | | | Fixes #13928
* | Merge branch 'improve-award-emoji-spec' into 'master' Douwe Maan2016-03-141-4/+1
|\ \ | | | | | | | | | | | | | | | | | | Improve award emoji test reliability and eliminate sleeps Closes #14129 See merge request !3195
| * | Improve award emoji test reliability and eliminate sleepsimprove-award-emoji-specStan Hu2016-03-131-4/+1
| | | | | | | | | | | | Closes #14129