summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Fixed issue with assignee object not being returnedPhil Hughes2016-04-221-0/+21
| | | | Closes #15515
* Merge branch 'issue_3799' into 'master' Rémy Coutable2016-04-221-0/+30
|\ | | | | | | | | | | | | | | | | Allow filtering by Owned projects on dashboard page Closes #3799 ![Screen_Shot_2016-04-15_at_9.40.52_PM](/uploads/440498c5647bda282304891307931a02/Screen_Shot_2016-04-15_at_9.40.52_PM.png) See merge request !3762
| * Merge remote-tracking branch 'origin/master' into issue_3799Alfredo Sumaran2016-04-2162-278/+1950
| |\
| * | Add testsAlfredo Sumaran2016-04-181-0/+30
| | |
* | | Merge branch 'confirmation-screen' into 'master' Robert Speicher2016-04-221-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improved email confirmation UX Closes #4228 See merge request !3184
| * | | Improved confirmation UXconfirmation-screenPhil Hughes2016-04-211-2/+2
| | | | | | | | | | | | | | | | Closes #4228
* | | | Merge branch 'rs-diff_view' into 'master' Rémy Coutable2016-04-222-8/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always read diff_view setting from the cookie Prior, when the user had their view set to "parallel" and then visited a merge request's changes tab _without_ passing the `view` parameter via query string, the view would be parallel but the `Notes` class was always instantiated with the default value from `diff_view` ("inline"), resulting in broken markup when the form to add a line note was dynamically inserted. The cookie is set whenever the view is changed, so this value should always be up-to-date. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557 and https://gitlab.com/gitlab-org/gitlab-ce/issues/15285 See merge request !3732
| * | | | Clarify that the diff view setting always comes from the cookiers-diff_viewRobert Speicher2016-04-191-8/+0
| | | | | | | | | | | | | | | | | | | | This invalidates one test, which we've removed.
| * | | | Always read diff_view setting from the cookieRobert Speicher2016-04-141-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior, when the user had their view set to "parallel" and then visited a merge request's changes tab _without_ passing the `view` parameter via query string, the view would be parallel but the `Notes` class was always instantiated with the default value from `diff_view` ("inline"), resulting in broken markup when the form to add a line note was dynamically inserted. The cookie is set whenever the view is changed, so this value should always be up-to-date. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557
* | | | | Use association search in issuable create serviceGrzegorz Bizon2016-04-221-6/+6
| | | | |
* | | | | Add affinity checks in issue create serviceGrzegorz Bizon2016-04-221-2/+9
| | | | |
* | | | | Update specs to accomodate issuable assign changesGrzegorz Bizon2016-04-224-21/+31
| | | | |
* | | | | Verify label affiliation before assigning to issueGrzegorz Bizon2016-04-221-0/+28
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | This also verify if milestone belongs to correct project before creating a new issue. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15439
* | | | Merge branch '15465-fix-sort-by-due-date' into 'master' Yorick Peterse2016-04-211-0/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove the `.distinct` when finding issues See merge request !3858
| * | | | Remove the `.distinct` when finding issues15465-fix-sort-by-due-dateRémy Coutable2016-04-211-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not needed anymore after !3815. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'dev_issue_15331' into 'master' Robert Speicher2016-04-212-2/+15
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes window.opener bug Adds `noreferrer` value to rel attribute for external links REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15331 See merge request !1953
| * | | | Fix failing specAlfredo Sumaran2016-04-212-2/+15
| | | | |
* | | | | Merge branch 'label-dropdown-fix' into 'master' Jacob Schatz2016-04-211-0/+79
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes "create label" functionality on label dropdown **Issue sidebar** ![label_dropdown](/uploads/2a056136fc88626530fc275ded0c2aa3/label_dropdown.gif) **Issues page** ![label_dropdown_issues](/uploads/965fd20f5b206499e9b11a64556c5240/label_dropdown_issues.gif) See merge request !3670
| * | | | Merge remote-tracking branch 'origin/master' into label-dropdown-fixlabel-dropdown-fixAlfredo Sumaran2016-04-206-7/+318
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into label-dropdown-fixAlfredo Sumaran2016-04-2052-129/+1662
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/shared/issuable/_sidebar.html.haml
| * | | | | | Add tests to check if a new label is addedAlfredo Sumaran2016-04-151-0/+79
| | | | | | |
* | | | | | | Merge branch 'fix/label-filters' into 'master' Douwe Maan2016-04-212-28/+53
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter labels by including ALL filter titles Fixed query to use `AND` and not `OR`. Refactored relevant specs See merge request !3815
| * | | | | | | refactored specs based on feedbackfix/label-filtersJames Lopez2016-04-212-31/+18
| | | | | | | |
| * | | | | | | use wait_for_ajax instead of sleeping for 2 days!James Lopez2016-04-211-10/+12
| | | | | | | |
| * | | | | | | refactored specs, adding more scenariosJames Lopez2016-04-212-22/+34
| | | | | | | |
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/label-filtersJames Lopez2016-04-2137-59/+1223
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | # Conflicts: # spec/features/issues/filter_by_labels_spec.rb
| * | | | | | | final line missingJames Lopez2016-04-201-1/+1
| | | | | | | |
| * | | | | | | fix rubocop warningJames Lopez2016-04-201-2/+2
| | | | | | | |
| * | | | | | | udpated a few things based on MR feedback. Also added model specJames Lopez2016-04-202-171/+192
| | | | | | | |
| * | | | | | | filter labels by including all filter titles as part of the queryJames Lopez2016-04-191-0/+170
| | | | | | | |
* | | | | | | | Merge branch 'issue_5838' into 'master' Rémy Coutable2016-04-214-14/+30
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show project members only for members fixes #5838 See merge request !3752
| * | | | | | | | Add changelog entry and fix convention in a specissue_5838Felipe Artur2016-04-201-1/+1
| | | | | | | | |
| * | | | | | | | Projects members tab should follow visibility levelsFelipe Artur2016-04-184-27/+16
| | | | | | | | |
| * | | | | | | | Show project members only for membersFelipe Artur2016-04-181-0/+27
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'fix/cross-project-labels-project-reference' into 'master' Grzegorz Bizon2016-04-211-16/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cross-project label ref used with invalid project When cross-project label reference was used with invalid project reference, `nil` was assigned to project variable which later caused an exception. Closes #15168 See merge request !3811
| * | | | | | | | Fix cross-project label ref with invalid projectGrzegorz Bizon2016-04-211-16/+26
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Closes #15168
* | | | | | | | Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński2016-04-2114-164/+222
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1925-92/+750
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | | Fix rubocopKamil Trzcinski2016-04-181-1/+1
| | | | | | | | |
| * | | | | | | | Fix testsKamil Trzcinski2016-04-182-25/+26
| | | | | | | | |
| * | | | | | | | Make some logic less twistableKamil Trzcinski2016-04-171-1/+1
| | | | | | | | |
| * | | | | | | | Write specs for this featureKamil Trzcinski2016-04-163-1/+159
| | | | | | | | |
| * | | | | | | | Rename CiStatus to StatusableKamil Trzcinski2016-04-162-2/+10
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-1635-204/+1195
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | | | Cleanup changesKamil Trzcinski2016-04-132-6/+1
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-1324-97/+550
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix CiStatus implementation and testsKamil Trzcinski2016-04-131-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Fix rest of rspec and spinach testsKamil Trzcinski2016-04-121-3/+12
| | | | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-115-14/+122
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/commits/_commit.html.haml
| * | | | | | | | | | | Fix specsKamil Trzcinski2016-04-1113-160/+47
| | | | | | | | | | | |