Commit Graph
1377 Commits
Author SHA1 Message Date
Robert Speicher ffc3acd498 Merge branch 'issues-show-performance' into 'master'
Improve performance of viewing individual issues

This MR does two things:

1. `Issue#related_branches` no longer performs Git operations that aren't needed
2. The output of `Repository#exists?` is now cached and flushed properly

Combined these two changes should further cut down the amount of Git operations performed when viewing individual issues (and possibly other pages).

See merge request !3296
2016-03-21 14:42:25 +00:00
Yorick Peterse 75aaf91cb1 Create SSH keys for SSH clone Spinach tests
These tests would check if the "This project is empty" banner would
contain SSH clone URLs. Oddly enough this should have never passed (as
far as I can tell) as SSH clone URLs in this banner are _only_ displayed
if the current user has at least 1 SSH key attached. Since the tests
never seem to create any they never should have passed, yet somehow they
did. To solve this the Spinach tests in question now ensure at least 1
SSH key is present.
2016-03-21 11:40:13 +01:00
Stan Hu 91f9866cce Fix specs and remove unnecessary console.log 2016-03-20 05:53:43 -07:00
Yorick Peterse fc5ff7af61 Create repositories in Spinach issues tests
Similar to ad90dba5185e30883d5ad6008c166b0df0108ebf we always have a
repository in the real world, so let's also create one in our Spinach
tests.
2016-03-19 21:54:08 +01:00
Jacob Schatz 9280fd4acd Merge branch 'fix-mr-close-button' into 'master'
Fixes issue with close button not working on MR

Closes #14383

See merge request !3295
2016-03-18 14:49:00 +00:00
Phil Hughes 195ef985f3 Added test 2016-03-18 12:42:30 +00:00
Douwe Maan 9813eac56b Merge branch 'confidential-issues' into 'master'
Add confidential issues

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3678

More information: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/227

See merge request !3282
2016-03-18 12:04:56 +00:00
Jacob Schatz 4cd87d31bd Merge branch 'optimistic-todos' into 'master'
Adds small AJAX optimistic functionality to todos.

Fixes #13656 <br/>
A good first step and boring solution. <br/>
Will make ajax call to remove each issue.  <br/>
If issue is last in group of issues will refresh page.  <br/>
If issues remain in group will remove row with JS.  <br/>
Adds loading spinner to button and disables. <br/>

![todos-optimistic](/uploads/c6aec4a688e5125d4df55a2a3a55d4d7/todos-optimistic.gif) <br/>

cc @dzaporozhets @JobV @dbalexandre 

See merge request !2946
2016-03-18 11:23:16 +00:00
Stan Hu 0901d51724 Improve award emoji test reliability by checking that the emoji is displayed
before the search field is focused
2016-03-17 17:34:15 -07:00
Douglas Barbosa Alexandre 9222459ea3 Restrict access to confidential issues on activity feed 2016-03-17 20:56:00 -03:00
Phil Hughes ceaa694391 Fixed failing tests 2016-03-17 15:10:45 +00:00
Grzegorz Bizon 019fed0f72 Reuse no_cache_headers method in badges controller 2016-03-17 12:16:34 +01:00
Hiroyuki Sato f0b052e168 Fix wiki search results point to raw source 2016-03-17 08:58:52 +09:00
Robert Speicher 64d0dd1807 Merge branch 'fix-capybara-deprecation-warnings' into 'master'
Fix Capybara 2.6.2 deprecation warnings

See merge request !3236
2016-03-16 00:00:38 +00:00
Stan Hu 7c61bdcf6f Fix Capybara 2.6.2 deprecation warnings 2016-03-15 11:03:17 -07:00
Rémy Coutable 54ec7e9599 Improving the original label-subscribing implementation
1. Make the "subscribed" text in Issuable sidebar reflect the labels
   subscription status

2. Current user mut be logged-in to toggle issue/MR/label subscription
2016-03-15 18:22:02 +01:00
Timothy AndrewandRémy Coutable 0444fa560a Original implementation to allow users to subscribe to labels
1. Allow subscribing (the current user) to a label

- Refactor the `Subscription` coffeescript class
  - The main change is that it accepts a container, and conducts all
    DOM queries within its scope. We need this because the labels
    page has multiple instances of `Subscription` on the same page.

2. Creating an issue or MR with labels notifies users subscribed to those labels

- Label `has_many` subscribers through subscriptions.

3. Adding a label to an issue or MR notifies users subscribed to those labels

- This only applies to subscribers of the label that has just been
  added, not all labels for the issue.
2016-03-15 17:25:37 +01:00
Rémy Coutable 5c1f6f8cfc Merge branch 'revert-avatar-cropping' into 'master'
Revert the avatar cropping feature

Reverts !2951 since the added 'mini_magick' dependency should be replaced by client-side croppping

See merge request !3223
2016-03-15 15:53:42 +00:00
Douwe Maan 6f50cef809 Merge branch 'fix/13928-wrong-iid-of-max-iid' into 'master'
Fixes "iid of max iid" in Issuable sidebar for merged MR


Fixes #13928.

See merge request !3046
2016-03-15 15:17:08 +00:00
Robert Speicher 90e91e28e4 Merge branch 'application-settings' into 'master'
Applications tab on profile settings

Closes #13855

See merge request !3031
2016-03-15 14:33:14 +00:00
Rémy Coutable 1714883107 Revert "Merge branch 'avatar-cropping' into 'master' "
This reverts commit 01160fc061, reversing
changes made to 4bff9daf8b.
2016-03-15 14:55:40 +01:00
Robert Speicher c4b35a6230 Merge branch 'fix-commit-status-rendering' into 'master'
Cleanup Ci::Commit, Ci::Build and CommitStatus views

This MR tries to do first sweep of cleanups to Ci::Commit and
Ci::Build objects removing all view-related functions and fixing the
API from other side.

Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/6046

See merge request !2760
2016-03-15 00:51:43 +00:00
Douwe Maan 29b186e49d Merge branch 'improve-award-emoji-spec' into 'master'
Improve award emoji test reliability and eliminate sleeps

Closes #14129

See merge request !3195
2016-03-14 19:57:25 +00:00
Dmitriy Zaporozhets d324bf8434 Merge branch 'share-project-ce' into 'master'
Bring from EE: Share Project with Group

- [x] Models and migrations
- [x] Logic, UI
- [x] Tests
- [x] Documentation
- [x] Share with group lock
- [x] Api feature
- [x] Api docs
- [x] Api tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For #12831 

cc @DouweM @rspeicher @vsizov

See merge request !3186
2016-03-14 16:38:52 +00:00
Robert Speicher 9c3643046b Merge branch 'issue-filter-tests' into 'master'
Fixed tests for MR & issue filters

See merge request !3203
2016-03-14 15:47:27 +00:00
Robert Speicher a6cef2370b Merge branch 'remove-sleeps-from-network-graph-spec' into 'master'
Remove sleeps from network graph feature spec

Also removed a double negative in the step description

See merge request !3199
2016-03-14 15:14:49 +00:00
Phil Hughes 35aca2d5fd Fixed tests for MR & issue filters 2016-03-14 13:49:53 +00:00
Kamil Trzcinski 0672258915 Cleanup CiCommit and CiBuild
- Remove all view related methods from Ci::Build and CommitStatus
- Remove unused Ci::Commit and Ci::Build methods
- Use polymorphism to render different types of CommitStatus
2016-03-14 13:20:35 +01:00
Stan Hu f0c73a5bdb Remove sleeps from network graph feature spec 2016-03-13 22:09:42 -07:00
Stan Hu ab0af56201 Use Capybara find methods and remove sleeps in feature specs in "All Issues" filter 2016-03-13 17:22:10 -07:00
Stan Hu a181722ae4 Improve award emoji test reliability and eliminate sleeps
Closes #14129
2016-03-13 13:39:28 -07:00
Dmitriy Zaporozhets 55ceda1204 Bring shared project feature tests from EE
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-12 14:45:14 +01:00
Robert Speicher ee14ac68a5 Merge branch 'group-activity-separate-tab' into 'master'
Move group activity feed to separate page for consistency with dashboard
and project pages

Fixes #14161. Part of #13480 

See merge request !3157
2016-03-11 19:58:10 +00:00
Dmitriy Zaporozhets 068fd5de8a Add finders logic and tests for shared projects feature
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-11 18:55:17 +01:00
Jacob Schatz 6968ea32e2 Merge branch 'award-emoji-design-update' into 'master'
Updated UI of award emoji

Closes #13878 

See merge request !3028
2016-03-11 16:06:18 +00:00
Jacob Schatz cec88d81bb Merge branch 'account-settings' into 'master'
Account settings

Closes #13854

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4802a7b4f74f17d25a611ed1a2200445/account-settings.png)

See merge request !3039
2016-03-11 13:08:40 +00:00
Jacob Schatz d343c7a159 Merge branch 'comment-discard-button' into 'master'
Added discard button to comment form

Also changed the labels on the buttons to better match the action they are completing.

Closes #8057

See merge request !3085
2016-03-11 13:07:43 +00:00
Dmitriy Zaporozhets 1f08363650 Merge branch 'comment-error' into 'master'
Add error for ajax:error when submitting comments

Fixes #13814
![Screen_Shot_2016-02-25_at_1.54.56_PM](/uploads/d70d706d306079df1b00d70f09affb63/Screen_Shot_2016-02-25_at_1.54.56_PM.png)
cc @dblessing 

See merge request !2976
2016-03-11 13:00:59 +00:00
Phil Hughes d5f145bf8b Fixed failing tests 2016-03-11 09:51:07 +00:00
Phil Hughes a7e76a6119 Updated award emoji tests 2016-03-11 09:02:43 +00:00
ashleys 4cd9a5208c web hooks to webhooks 2016-03-10 14:48:29 -05:00
Jacob Schatz 136ba502d3 Change test in an attempt to pass.
Thanks @rspeicher!
2016-03-10 12:20:00 -05:00
Phil Hughes 8d7e0f0ba9 Fixed failing tests 2016-03-10 13:54:54 +00:00
Dmitriy Zaporozhets e3efce9237 Move group activity feed to separate page for consistency with dashboard and project pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-10 14:29:38 +01:00
Kamil Trzcinski af43401602 Retry spinach tests 2016-03-09 14:22:32 +01:00
Dmitriy Zaporozhets c674ffe0e0 Merge branch 'improve-archived-projects' 2016-03-09 09:51:59 +01:00
Rémy Coutable e632bd26e4 Fixes "iid of max iid" in Issuable sidebar for merged MR
Fixes #13928
2016-03-08 16:23:20 +01:00
Robert Speicher 56c4f22c80 Remove redundant integration tests
These three tests were essentially checking that adding a note to
something updated its `noteable`'s `updated_at` attribute.

This is well-tested Rails behavior and we shouldn't feel the need to
write an integration test to verify it. At most we should be ensuring
that the association definition adds the `touch: true` option, which we
now do in Note's unit test.
2016-03-07 15:33:26 -05:00
Douwe Maan 903aa7c95e Merge branch 'issue_13621_2' into 'master'
Labels should be visible in dashboard and group milestone views

Closes #13621

See merge request !2931
2016-03-07 17:18:25 +00:00
Douwe Maan eab7892dc1 Merge branch 'rs-factory-nitpicks' into 'master'
More Factory cleanup

Addresses nitpicks from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2847

See merge request !3108
2016-03-07 09:02:49 +00:00