summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
* Add `Group#add_*` convenience methodsrs-group-convenience-methodsRobert Speicher2015-08-074-4/+4
| | | | Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
* Merge branch 'add-current-user-to-autocomplete' into 'master'Dmitriy Zaporozhets2015-08-061-2/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always add current user to autocomplete controller to support filter by "Me" ### What does this MR do? This MR always adds the current user to the autocomplete list of users. ### Why was this MR needed? Normally only the members from a team or the group are shown in the autocomplete list. However, this prevents a user from filtering issues belong to him/her if the user does not belong directly to either. To make this filtering more usable, we can be sure to add the current user to the list, which the JavaScript code will move to the top of the list. ### What are the relevant issue numbers? Partial fix #2202 See merge request !1100
| * Always add current user to autocomplete controller to support filter by "Me"Stan Hu2015-08-061-2/+3
| | | | | | | | Partial fix #2202
* | Remove trailing linesreport-spamDmitriy Zaporozhets2015-08-061-2/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add tests for abuse report featureDmitriy Zaporozhets2015-08-065-0/+67
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-047-3/+61
|\ \ | |/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix network graph when branch name has single quotesStan Hu2015-07-292-2/+17
| | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9500
| * Fix commit data retrieval when branch name has single quotesStan Hu2015-07-262-0/+24
| | | | | | | | Closes #1724
| * Allow custom label to be set for authentication providers.auth-icons-labelsDouwe Maan2015-07-231-1/+8
| |
| * Add support for destroying project milestonesStan Hu2015-07-172-0/+12
| | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/1504
* | Use real branches from test repoDmitriy Zaporozhets2015-07-161-4/+4
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix application initializeDmitriy Zaporozhets2015-07-151-1/+1
| |
* | Remove satellitesDmitriy Zaporozhets2015-07-152-6/+0
|/
* 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>
View Lorry Controller Status