summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
* Fixed project settings testsproject-settingsPhil Hughes2016-05-201-1/+1
|
* Fix spinach testsKamil Trzcinski2016-05-161-2/+2
|
* Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-161-6/+6
|\
| * Update specsDouwe Maan2016-05-131-6/+6
| |
* | Fix spinach testsKamil Trzcinski2016-05-142-2/+2
|/
* Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-134-4/+4
|
* 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-102-136/+0
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'rs-backport-ee-372' into 'master' Rémy Coutable2016-05-092-39/+3
|\ \ | | | | | | | | | | | | | | | | | | Backport changes from gitlab-org/gitlab-ee!372 Mostly replaces several Spinach tests with RSpec Feature tests. See merge request !4043
| * | Backport changes from gitlab-org/gitlab-ee!372rs-backport-ee-372Robert Speicher2016-05-042-39/+3
| | | | | | | | | | | | Mostly replaces several Spinach tests with RSpec Feature tests.
* | | Merge branch 'master' into group-navigation-redesignDmitriy Zaporozhets2016-05-052-4/+4
|\ \ \ | |/ /
| * | Merge branch 'clean-user-profile-classes' into 'master' Jacob Schatz2016-05-041-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused .contributed-projects class While working on #13401 and trying to add a new tab to the user profile page, I came across this. I noticed that the `contributed-projects` class was only being used in order to select the div in the tests. For consistency with the other tabs, I decided to remove this class and use the div's id for the selector. See merge request !3945
| | * | Remove unused .contributed-projects classKarlo Soriano2016-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While working on #13401 and trying to add a new tab to the user profile page, I came across this. I noticed that the `contributed-projects` class was only being used in order to select the div in the tests. For consistency with the other tabs, I decided to remove this class and use the div's id for the selector.
| * | | Merge branch 'use-rugged-to-create-tag' into 'master' Rémy Coutable2016-05-041-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_tag for better performance This was originally opened at !1757 by @pcarranza but I changed it to use Rugged instead of gitlab_git, following @DouweM's request. Once this is merged, https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/26 will be mergeable too. See merge request !3745
| | * | | 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 'fix-typo-in-user-steps' into 'master' Rémy Coutable2016-05-041-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Fix typo in user steps feature file Just came across a typo in the user steps file. See merge request !3943
| | * | Fix typo in user steps featureKarlo Soriano2016-04-271-1/+1
| | |/ | | | | | | | | | [ci skip]
* | | Remove go to dashboard test suite for group page and get rid of AR warningDmitriy Zaporozhets2016-05-033-10/+4
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | 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
| | |
* | | Merge branch 'project-deploy-keys-ui' into 'master' Jacob Schatz2016-04-282-8/+7
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Project deploy keys updated UI Closes #13992 See merge request !3912
| * | Updated tests for deploy keysproject-deploy-keys-uiPhil Hughes2016-04-252-8/+7
| |/
* | Fixed testsPhil Hughes2016-04-262-0/+6
|/
* Merge branch 'top-navigation-concept' into 'master' Dmitriy Zaporozhets2016-04-211-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement top navigation for profile area Main idea is to keep left sidebar static so user is not confused by changing context. Instead we put changing navigation with changing content in one main block. I used profile area as a simplest way to implement and test this concept. Your feedback is welcome in comments For https://gitlab.com/gitlab-org/gitlab-ce/issues/14354#note_4878536 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3824
| * Fix tests and remove countersDmitriy Zaporozhets2016-04-191-0/+4
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński2016-04-213-5/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-pipelineci-commit-as-pipelineKamil Trzcinski2016-04-191-1/+1
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | Fix testsKamil Trzcinski2016-04-181-1/+1
| | | |
| * | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-165-8/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | Support skipped statusKamil Trzcinski2016-04-131-1/+1
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-132-0/+16
| |\ \ \ \
| * | | | | Fix rubocopKamil Trzcinski2016-04-121-1/+1
| | | | | |
| * | | | | Fix rest of rspec and spinach testsKamil Trzcinski2016-04-122-4/+4
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-115-15/+24
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/commits/_commit.html.haml
| * | | | | | Fix specsKamil Trzcinski2016-04-112-2/+2
| | | | | | |
* | | | | | | Merge branch 'multi-filter-labels' into 'master' Jacob Schatz2016-04-202-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mutliple label filter Fixes #989 See merge request !3438
| * | | | | | | fix failing testsArinde Eniola2016-04-142-0/+5
| | | | | | | |
* | | | | | | | Merge branch 'license-templates-and-api-12804' into 'master' Robert Speicher2016-04-202-15/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | License templates when creating/editing a LICENSE file Closes #12804 See merge request !3660
| * | | | | | | Fix specsRémy Coutable2016-04-182-15/+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-192-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-182-6/+6
| |/ / / / / /
* | | | | | | 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
* | | | | | Fixed testsPhil Hughes2016-04-161-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch '14176-diff-paste-data' into 'master' Jacob Schatz2016-04-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copying and pasting doesn't grab line numbers or +/- Fixes #14176 See merge request !3687
| * | | | | Update click_diff_lineAnnabel Dunstone2016-04-141-1/+1
| |/ / / /
* | | | | Merge branch 'subscribe-button-fix' into 'master' Jacob Schatz2016-04-143-5/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed references to subscribe-button CSS class These were being blocked by adblocks Closes #15043 See merge request !3677
| * | | | Removed references to subscribe-button CSS classPhil Hughes2016-04-123-5/+5
| | |/ / | |/| | | | | | | | | | | | | | | | | | These were being blocked by adblocks Closes #15043
* | | | Load related MRs/branches asynchronouslyYorick Peterse2016-04-131-2/+5
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently this works by loading the HAML partials via XHR. While this is not the nicest setup it _is_ the easiest setup using the tools we currently have. Loading this data asynchronously doesn't make loading the related MRs/branches itself faster, it merely ensures that loading the issue itself is not slowed down. Fixes gitlab-org/gitlab-ce#14949