Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/features
AgeCommit message (Collapse)Author
2015-06-29Merge branch 'rs-fix-subscription-feature' into 'master'Dmitriy Zaporozhets
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
2015-06-27Fix "Project Forked Merge Requests" scenarioRobert Speicher
2015-06-26Merge branch 'rs-issue-1887' into 'master'Dmitriy Zaporozhets
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
2015-06-26Use page.within in testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26Attempt to fix the "I should see that I am [un]subscribed" stepsRobert Speicher
Makes use of Capybara methods that wait. Hopefully this will fix the random timing-related failures of this step.
2015-06-26Fix merge request diff featuresRobert Speicher
2015-06-25Write test for submitting issue as guestDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-23Merge branch 'split-tests' into 'master'Dmitriy Zaporozhets
Split rspec and spinach tests in parallel For https://dev.gitlab.org/gitlab/gitlabhq/issues/2386 See merge request !874
2015-06-23Merge branch 'fix-diff-patch-public-mr' into 'master'Dmitriy Zaporozhets
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
2015-06-23Refactor rake tasks for testsDmitriy Zaporozhets
2015-06-23Merge branch 'admin-edit-identities' into 'master'Dmitriy Zaporozhets
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
2015-06-23Fix tests for admin identities after migrate to rspec3Dmitriy Zaporozhets
2015-06-23Fix downloading of patches on public merge requests when user logged outStan Hu
Closes #1225 Closes #1854 Closes #1858
2015-06-23Merge branch 'master' into admin-edit-identitiesDmitriy Zaporozhets
2015-06-23Merge branch 'master' into rubocop-for-testsDmitriy Zaporozhets
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
2015-06-23Merge branch 'fix-project-icon-links' into 'master'Dmitriy Zaporozhets
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
2015-06-22Fix avatar tests to use banana_sample.gif since SVG is not supportedStan Hu
2015-06-22Merge branch 'master' into admin-edit-identitiesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/admin/users/show.html.haml
2015-06-22Fix indendity testDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22Merge branch 'revert-mr-state-names'Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/merge_requests.rb
2015-06-22Fix rubocop issues at feature/ directoryDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22Fix features syntaxRobert Speicher
2015-06-22Started on the actual rspec 3 upgradeJeroen van Baarsen
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-06-20Merge branch 'fix-error-500-internal-snippet' into 'master'Douwe Maan
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
2015-06-20Fix Error 500 when one user attempts to access a personal, internal snippetStan Hu
Closes #1815
2015-06-19Revert merge request states renamingDmitriy Zaporozhets
Replaced: * "Accepted" with "Merged" * "Rejected" with "Closed" Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-19Add tests for admin managing user identitiesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-19Remove "Multiselect Blob" feature specsRobert Speicher
These are well covered by the new Jasmine tests, and faster!
2015-06-16Merge branch 'support-comment-parallel-diff' into 'master'Douwe Maan
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
2015-06-16Support commenting on a diff in side-by-side viewStan Hu
Closes https://github.com/gitlabhq/gitlabhq/issues/9283
2015-06-16Merge branch 'applications_form' into 'master'Douwe Maan
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
2015-06-15Fix consistency issues on New Application page.Nicolas
2015-06-14Move the "Design" templates and logic to PreferencesRobert Speicher
2015-06-14Add Profiles::PreferencesControllerRobert Speicher
2015-06-12Call `page.all` instead of `all` in feature stepsRobert Speicher
There's a naming conflict between Capybara and rspec-matchers which both define the `all` method. See https://github.com/jnicklas/capybara/issues/1396
2015-06-12Change `within` to `page.within` in feature stepsRobert Speicher
2015-06-12Update all `should`-style syntax to `expect` in featuresRobert Speicher
2015-06-12Fix test for accept merge requestDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11Fix merge request testDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-10Use stub_const to stub constants instead of redefining themRobert Speicher
They're called constants for a reason, after all.
2015-06-09Move Project Members link from Settings to main menu.Nicolas
Addresses #2278.
2015-06-08Properly click on user profile pictureDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-08Fix testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-04Merge branch 'rs-remove-guard' into 'master'Dmitriy Zaporozhets
Remove Guard None of the GitLab B.V. developers were using it. See internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2360 See merge request !764
2015-06-04Remove unnecessary require from Spinach envRobert Speicher
2015-06-04Remove show actions from Admin and Project DeployKeysRobert Speicher
2015-05-29Merge branch 'support-edit-target-branch-in-mr' into 'master'Dmitriy Zaporozhets
Support editing target branch of merge request ### What does this MR do? This MR makes it possible to edit the target branch of a merge request and adds a system note when this happens. ### Why was this MR needed? Because lots of people requested this feature. :) ### Screenshots **Edit MR page** ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9b3d405bf7b5f945e35bae3534c2b67b/image.png) **New MR page** ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3657a2a9efad6d10e8470637d1166bdb/image.png) **System note** ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cc8066f3d3bdf09c0cce27193210567d/image.png) ### What are the relevant issue numbers? * Closes https://github.com/gitlabhq/gitlabhq/issues/7105 * See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130! See merge request !738
2015-05-29Fix tests for group leave featureDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-29Support editing target branch of merge requestStan Hu
Closes https://github.com/gitlabhq/gitlabhq/issues/7105 See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130
2015-05-29Merge pull request #9318 from jvanbaarsen/allow-special-chars-bioDmitriy Zaporozhets
Allow special characters in users bio
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-19 12:50:14 +0300