summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
* Remove trailing linesDmitriy Zaporozhets2015-08-071-2/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add tests for abuse report featureDmitriy Zaporozhets2015-08-075-0/+67
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Make left menu more hierarchical and less contextual by adding back item at topDmitriy Zaporozhets2015-07-104-0/+31
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Improve readme testsDmitriy Zaporozhets2015-07-091-3/+6
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Dont check for link but for actual readme contentDmitriy Zaporozhets2015-07-091-1/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix project testsproject-home-pageDmitriy Zaporozhets2015-07-082-13/+9
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix creating file in new repoDmitriy Zaporozhets2015-07-081-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix schortcut testsDmitriy Zaporozhets2015-07-081-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Cleanup and some test fixes after refactoring project home pageDmitriy Zaporozhets2015-07-085-2/+11
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add shortcut for project activity pageDmitriy Zaporozhets2015-07-082-1/+12
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Audit log for user authenticationValery Sizov2015-07-065-9/+9
|
* Merge branch 'improve-spinach-test-for-mr-submit' into 'master'Stan Hu2015-07-011-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Add an expect call to prevent random Spinach failure This should help prevent getting the error: ``` Unable to find field "merge_request_title ``` This was happening probably because it takes some time after the "Compare branches" button is hit before the "New merge request" page showed up. See merge request !882
| * Add an expect call to prevent random Spinach failure:Stan Hu2015-06-231-0/+1
| | | | | | | | "Unable to find field "merge_request_title"
* | Merge branch 'group_settings_nav' into 'master'Douwe Maan2015-07-011-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix consistency issue in sidebars of Project and Group Settings. Fixes #2277 ![before_after_group_settings_nav](https://dev.gitlab.org/gitlab/gitlabhq/uploads/370c701d0eff8f1f8e44cf954c75f2bf/before_after_group_settings_nav.png) See merge request !1871
| * | Fix consistency issue in sidebars of Project and Group Settings.Nicolas2015-06-241-2/+2
| |/ | | | | | | Fixes #2277.
* | Merge branch 'rs-fix-subscription-feature' into 'master'Dmitriy Zaporozhets2015-06-292-5/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Attempt to fix the "I should see that I am [un]subscribed" steps Makes use of Capybara methods that wait. Hopefully this will fix the random timing-related failures of this step. See merge request !853
| * | Attempt to fix the "I should see that I am [un]subscribed" stepsrs-fix-subscription-featureRobert Speicher2015-06-252-5/+4
| |/ | | | | | | | | Makes use of Capybara methods that wait. Hopefully this will fix the random timing-related failures of this step.
* | Fix "Project Forked Merge Requests" scenarioRobert Speicher2015-06-261-1/+0
| |
* | Merge branch 'rs-issue-1887' into 'master'Dmitriy Zaporozhets2015-06-262-20/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorder MergeRequestTabs constructor The tab was being activated before we set the `[commits|diffs]Loaded` variable, so even when the `/diffs` route is accessed directly, like from the "Side-by-side" link, the tab was being loaded from its default source. Fixes #1887 See merge request !892
| * | Fix merge request diff featuresrs-issue-1887Robert Speicher2015-06-252-20/+14
| |/
* | Use page.within in testsDmitriy Zaporozhets2015-06-261-3/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Write test for submitting issue as guestDmitriy Zaporozhets2015-06-252-0/+30
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'split-tests' into 'master'Dmitriy Zaporozhets2015-06-231-1/+1
|\ | | | | | | | | | | | | | | Split rspec and spinach tests in parallel For https://dev.gitlab.org/gitlab/gitlabhq/issues/2386 See merge request !874
| * Refactor rake tasks for testsDmitriy Zaporozhets2015-06-231-1/+1
| |
* | Merge branch 'fix-diff-patch-public-mr' into 'master'Dmitriy Zaporozhets2015-06-233-0/+39
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix downloading of patches on public merge requests when user logged out ### What does this MR do? This MR makes it possible to download a diff patch on a public merge request when a user is logged out. ### Why was this MR needed? An Error 500 would result when a user attempted to click on the "Email Patches" or "Plain Diff" button: ``` NoMethodError - undefined method `id' for nil:NilClass: lib/gitlab/backend/shell_env.rb:9:in `set_env' lib/gitlab/satellite/action.rb:20:in `in_locked_and_timed_satellite' lib/gitlab/satellite/merge_action.rb:49:in `diff_in_satellite' app/models/merge_request.rb:219:in `to_diff' app/controllers/projects/merge_requests_controller.rb:42:in `block (2 levels) in show' ``` ### What are the relevant issue numbers? * Closes #1225 * Closes #1854 (dup) * Closes #1858 (dup) See merge request !872
| * Fix downloading of patches on public merge requests when user logged outStan Hu2015-06-233-0/+39
| | | | | | | | | | | | Closes #1225 Closes #1854 Closes #1858
* | Merge branch 'admin-edit-identities' into 'master'Dmitriy Zaporozhets2015-06-232-1/+60
|\ \ | |/ |/| | | | | | | | | | | | | | | Admin can see, edit and remove user identities Related to #1415 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2224 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !843
| * Fix tests for admin identities after migrate to rspec3Dmitriy Zaporozhets2015-06-231-5/+2
| |
| * Merge branch 'master' into admin-edit-identitiesadmin-edit-identitiesDmitriy Zaporozhets2015-06-233-9/+9
| |\
| * \ Merge branch 'master' into admin-edit-identitiesDmitriy Zaporozhets2015-06-2219-199/+124
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/admin/users/show.html.haml
| * | | Fix indendity testDmitriy Zaporozhets2015-06-222-5/+14
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add tests for admin managing user identitiesDmitriy Zaporozhets2015-06-192-1/+54
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'master' into rubocop-for-testsDmitriy Zaporozhets2015-06-2314-64/+97
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/issues_spec.rb spec/models/forked_project_link_spec.rb spec/models/hooks/service_hook_spec.rb spec/models/hooks/web_hook_spec.rb spec/models/project_services/hipchat_service_spec.rb spec/requests/api/project_members_spec.rb spec/requests/api/projects_spec.rb spec/requests/api/system_hooks_spec.rb spec/services/archive_repository_service_spec.rb spec/support/matchers.rb spec/tasks/gitlab/backup_rake_spec.rb
| * | | Merge branch 'fix-project-icon-links' into 'master'Dmitriy Zaporozhets2015-06-233-9/+9
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Fix avatar tests to use banana_sample.gif Fixes tests that were broken in f5e0e5c0 due to the purge of `gitlab_logo.png`. See merge request !866
| | * | Fix avatar tests to use banana_sample.gif since SVG is not supportedStan Hu2015-06-223-9/+9
| | | |
| * | | Merge branch 'revert-mr-state-names'Dmitriy Zaporozhets2015-06-222-5/+5
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/merge_requests.rb
| | * | Revert merge request states renamingDmitriy Zaporozhets2015-06-192-5/+5
| | |/ | | | | | | | | | | | | | | | | | | | | | Replaced: * "Accepted" with "Merged" * "Rejected" with "Closed" Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix features syntaxRobert Speicher2015-06-2212-51/+83
| | |
| * | Started on the actual rspec 3 upgradeJeroen van Baarsen2015-06-221-0/+1
| | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | Fix rubocop issues at feature/ directoryDmitriy Zaporozhets2015-06-229-37/+35
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'fix-error-500-internal-snippet' into 'master'Douwe Maan2015-06-203-1/+36
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when one user attempts to access another's personal, internal snippet ### What does this MR do? This MR fixes an Error 500 that occurred if one user tried to access another's personal, internal snippet. Steps to reproduce: ### Why was this MR needed? 1. Go to `<hostname>/snippets/new`. 2. Select "Internal". 3. Create a snippet. Save the URL (e.g. `<hostname>/snippets/20`) 4. Logout and sign in as another user. 5. Go to the URL in step 3. ### What are the relevant issue numbers? Closes #1815 See merge request !854
| * | Fix Error 500 when one user attempts to access a personal, internal snippetStan Hu2015-06-193-1/+36
| |/ | | | | | | Closes #1815
* | Remove "Multiselect Blob" feature specsRobert Speicher2015-06-192-143/+0
|/ | | | These are well covered by the new Jasmine tests, and faster!
* Merge branch 'support-comment-parallel-diff' into 'master'Douwe Maan2015-06-163-8/+55
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support commenting on a diff in side-by-side view ### What does this MR do? This MR adds support for commenting on a diff in side-by-side (aka parallel) view. It also fixes a JavaScript bug (see !779) when the comment button is clicked on a line that already has a comment. There is an existing bug where the comment count is not updated when a new comment is added. I'll send a MR for that later. ### Why was this MR needed? Commenting only worked in "inline" mode. Often the side-by-side view is more conducive to writing comments. ### What are the relevant issue numbers? Closes https://github.com/gitlabhq/gitlabhq/issues/9283 ### Screenshot ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/3d0a3213fde38844a681a826da18139b/image.png) See merge request !810
| * Support commenting on a diff in side-by-side viewStan Hu2015-06-163-8/+55
| | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9283
* | Merge branch 'applications_form' into 'master'Douwe Maan2015-06-161-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix UI issues in Applications form @douwe Thanks for reviewing this small fix. --- Before: ![application_form_before](https://dev.gitlab.org/gitlab/gitlabhq/uploads/11fbee17ad6a4c9456cd7d6cba5ae429/application_form_before.png) --- After: ![application_form_after](https://dev.gitlab.org/gitlab/gitlabhq/uploads/0c64214ccda6c77095f468fcb8c748f3/application_form_after.png) See merge request !1859
| * Fix consistency issues on New Application page.Nicolas2015-06-151-1/+1
| |
* | Move the "Design" templates and logic to PreferencesRobert Speicher2015-06-132-34/+0
| |
* | Add Profiles::PreferencesControllerRobert Speicher2015-06-133-7/+7
|/
* Call `page.all` instead of `all` in feature stepsRobert Speicher2015-06-1210-12/+12
| | | | | | | There's a naming conflict between Capybara and rspec-matchers which both define the `all` method. See https://github.com/jnicklas/capybara/issues/1396
View Lorry Controller Status