Commit Graph
929 Commits
Author SHA1 Message Date
Dmitriy ZaporozhetsandValery Sizov 6ffca63004 Remove trailing lines
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-07 10:10:41 +03:00
Dmitriy ZaporozhetsandValery Sizov 864e2bb082 Add tests for abuse report feature
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-07 10:10:33 +03:00
Dmitriy Zaporozhets 4dfded8934 Make left menu more hierarchical and less contextual by adding back item at top
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-10 13:29:46 +02:00
Dmitriy Zaporozhets d8dfbc5118 Improve readme tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-09 14:31:03 +02:00
Dmitriy Zaporozhets 846538076b Dont check for link but for actual readme content
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-09 13:27:50 +02:00
Dmitriy Zaporozhets a0b9fe1288 Fix project tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 20:22:42 +02:00
Dmitriy Zaporozhets e05fbf0494 Fix creating file in new repo
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 17:41:59 +02:00
Dmitriy Zaporozhets 0ebe8be02d Fix schortcut tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 17:36:31 +02:00
Dmitriy Zaporozhets 39a4bb2abd Cleanup and some test fixes after refactoring project home page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 16:55:04 +02:00
Dmitriy Zaporozhets 8404ab46b9 Add shortcut for project activity page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 12:43:46 +02:00
Valery Sizov 411829fdb5 Audit log for user authentication 2015-07-06 12:36:08 +03:00
Stan Hu 0b4b045758 Merge branch 'improve-spinach-test-for-mr-submit' into 'master'
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
2015-07-01 16:54:32 +00:00
Douwe Maan 690aafebdb Merge branch 'group_settings_nav' into 'master'
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
2015-07-01 09:32:41 +00:00
Dmitriy Zaporozhets 32330e8c28 Merge branch 'rs-fix-subscription-feature' into 'master'
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-29 08:57:32 +00:00
Robert Speicher 9cc00aa501 Fix "Project Forked Merge Requests" scenario 2015-06-26 22:41:02 -04:00
Dmitriy Zaporozhets 06ab7d89f9 Merge branch 'rs-issue-1887' into 'master'
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-26 16:17:07 +00:00
Dmitriy Zaporozhets c9f21c9691 Use page.within in tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 16:01:02 +02:00
Robert Speicher d92bb3cfe0 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.
2015-06-25 21:37:16 -04:00
Robert Speicher e14d517b61 Fix merge request diff features 2015-06-25 21:30:18 -04:00
Dmitriy Zaporozhets 304386aa02 Write test for submitting issue as guest
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 16:38:14 +02:00
Nicolas a521e88fc0 Fix consistency issue in sidebars of Project and Group Settings.
Fixes #2277.
2015-06-24 18:05:16 +02:00
Stan Hu 357cd97199 Add an expect call to prevent random Spinach failure:
"Unable to find field "merge_request_title"
2015-06-23 23:19:32 -07:00
Dmitriy Zaporozhets b902a9b83d Merge branch 'split-tests' into 'master'
Split rspec and spinach tests in parallel

For https://dev.gitlab.org/gitlab/gitlabhq/issues/2386

See merge request !874
2015-06-23 15:17:11 +00:00
Dmitriy Zaporozhets 541f7675f9 Merge branch 'fix-diff-patch-public-mr' into 'master'
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-23 15:03:00 +00:00
Dmitriy Zaporozhets 12e0998635 Refactor rake tasks for tests 2015-06-23 16:48:52 +02:00
Dmitriy Zaporozhets 94f130cbfc Merge branch 'admin-edit-identities' into 'master'
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-23 14:24:16 +00:00
Dmitriy Zaporozhets 4acd1f5d6a Fix tests for admin identities after migrate to rspec3 2015-06-23 15:49:15 +02:00
Stan Hu 555fd0cf4a Fix downloading of patches on public merge requests when user logged out
Closes #1225
Closes #1854
Closes #1858
2015-06-23 05:34:21 -07:00
Dmitriy Zaporozhets 8c6cbd4306 Merge branch 'master' into admin-edit-identities 2015-06-23 12:09:45 +02:00
Dmitriy Zaporozhets f40b99d02e Merge branch 'master' into rubocop-for-tests
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-23 10:44:03 +02:00
Dmitriy Zaporozhets 4aa1fdd347 Merge branch 'fix-project-icon-links' into 'master'
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-23 08:32:21 +00:00
Stan Hu fe94254571 Fix avatar tests to use banana_sample.gif since SVG is not supported 2015-06-22 12:04:07 -07:00
Dmitriy Zaporozhets 73e003013f Merge branch 'master' into admin-edit-identities
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/admin/users/show.html.haml
2015-06-22 18:00:11 +02:00
Dmitriy Zaporozhets 3fe3cbf222 Fix indendity test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22 17:52:22 +02:00
Dmitriy Zaporozhets cc9b5c49d1 Merge branch 'revert-mr-state-names'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/merge_requests.rb
2015-06-22 15:43:09 +02:00
Dmitriy Zaporozhets f167f37e5a Fix rubocop issues at feature/ directory
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22 14:21:34 +02:00
Robert SpeicherandDmitriy Zaporozhets afec5efc7d Fix features syntax 2015-06-22 12:13:45 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets f3d99a1e9c Started on the actual rspec 3 upgrade
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-06-22 12:12:49 +02:00
Douwe Maan b2eef41d41 Merge branch 'fix-error-500-internal-snippet' into 'master'
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-20 10:38:33 +00:00
Stan Hu e785b9d2e2 Fix Error 500 when one user attempts to access a personal, internal snippet
Closes #1815
2015-06-19 21:23:46 -07:00
Dmitriy Zaporozhets 7524d7c082 Revert merge request states renaming
Replaced:
* "Accepted" with "Merged"
* "Rejected" with "Closed"

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-19 17:09:50 +02:00
Dmitriy Zaporozhets aca6d36722 Add tests for admin managing user identities
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-19 15:29:53 +02:00
Robert Speicher 1f88d9b56f Remove "Multiselect Blob" feature specs
These are well covered by the new Jasmine tests, and faster!
2015-06-19 04:31:24 -04:00
Douwe Maan adffe47d3c Merge branch 'support-comment-parallel-diff' into 'master'
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-16 14:43:15 +00:00
Stan Hu a7932fe2fd Support commenting on a diff in side-by-side view
Closes https://github.com/gitlabhq/gitlabhq/issues/9283
2015-06-16 06:11:59 -07:00
Douwe Maan 63969337a9 Merge branch 'applications_form' into 'master'
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-16 11:50:13 +00:00
Nicolas 4cf7d8d956 Fix consistency issues on New Application page. 2015-06-15 21:27:20 +02:00
Robert Speicher 0c0c31ff34 Move the "Design" templates and logic to Preferences 2015-06-13 17:58:16 -04:00
Robert Speicher 821fc4b034 Add Profiles::PreferencesController 2015-06-13 17:58:15 -04:00
Robert Speicher 4c42fc7c4c Call page.all instead of all in feature steps
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-12 05:12:42 -04:00