Commit Graph

262 Commits

Author SHA1 Message Date
Phil Hughes ce2e37d446 Fixed tests 2016-04-16 16:13:16 -04:00
Annabel Dunstone 2f81baf476 Update click_diff_line 2016-04-14 09:10:40 -05:00
Yorick Peterse 31e28ebceb
Load related MRs/branches asynchronously
Currently this works by loading the HAML partials via XHR. While this is
not the nicest setup it _is_ the easiest setup using the tools we
currently have.

Loading this data asynchronously doesn't make loading the related
MRs/branches itself faster, it merely ensures that loading the issue
itself is not slowed down.

Fixes gitlab-org/gitlab-ce#14949
2016-04-13 17:24:21 +02:00
Annabel Dunstone dab4ac54b6 Diff design updates 2016-04-07 15:33:18 -07:00
Annabel Dunstone 87b3c73ea5 Update diff_comments tests 2016-04-07 15:33:18 -07:00
Jacob Schatz f2b7cd4435 Revert "Merge branch 'new-navigation-prototype' into 'master'"
This reverts merge request !3494
2016-04-07 21:20:16 +00:00
Phil Hughes 1f50833430 Updated tests 2016-04-04 10:48:49 +01:00
Phil Hughes ccc64676a9 Commits comment test update 2016-04-04 10:48:49 +01:00
Phil Hughes 29f414aa5a Tests update 2016-04-04 10:48:49 +01:00
Dmitriy Zaporozhets 847940516b
Fix some active tab tests that are broken because of 2 level sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-01 22:35:49 +02: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
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
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
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 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
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
Phil Hughes f95f242cfa Updated tests 2016-03-04 13:52:29 +00:00
Pierre de La Morinerie 543845f7ef Indicate how much an MR branch diverges from the target branch 2016-03-03 15:11:44 +01:00
Pierre de La Morinerie 566ea8543d Tests: extract a merge_request_path helper 2016-03-03 14:50:12 +01:00
Alfredo Sumaran cb7dd09a9c Add click to tab steps 2016-03-01 17:42:39 -05:00
Zeger-Jan van de Weg 9a2869ab46 Branded login page also in CE
The only major difference with the EE version is the change from a light and dark logo to only a header logo
The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it
2016-02-26 15:50:51 +01:00
Dmitriy Zaporozhets 820d227b9e Merge remote-tracking branch 'origin/Baertierchen/gitlab-ce-showTestCoverage' 2016-02-25 19:02:57 +01:00
Rémy Coutable f36fde94d0 Add a spec for coverage indicator in project's builds list 2016-02-22 19:34:35 +01:00
Phil Hughes 62f4a9de19 Users don't get instructions to push to other users empty projects
Fixes #12518
2016-02-22 17:37:26 +00:00
Douglas Barbosa Alexandre 3d52e139b1 Rename Tasks to Todos 2016-02-20 12:39:27 -02:00
Douglas Barbosa Alexandre b05ab108f8 Add feature spec for task queue list page 2016-02-20 12:10:26 -02:00
Grzegorz Bizon bd7c52c734 Add feature specs for build erase button 2016-02-19 17:24:59 +01:00
Douglas Barbosa Alexandre 9823d00e0b Add ability to see and sort on vote count from Issues and MR lists 2016-02-17 11:32:02 -02:00
Rémy Coutable 54613b6af5 Fix the "x of y" displayed at the top of Issuables' sidebar
1. We now display the index of the current issuable among all its project's
issuables, of the same type and with the same state.
2. Also, refactored a bit the Issuable helpers into a new IssuablesHelper
module.
3. Added acceptance specs for the sidebar counter.
2016-02-15 15:40:24 +01:00
Grzegorz Bizon 9e6190485b Parse XML instead of HTML in tests for a SVG build badge 2016-02-11 10:29:15 +01:00
Grzegorz Bizon 29f2600ab6 Improve build badge tests, add another test case 2016-02-11 10:29:14 +01:00
Grzegorz Bizon cf0eab5047 Add feature tests for builds status badge 2016-02-11 10:29:14 +01:00
Kamil Trzcinski 6fea7c386f Merge remote-tracking branch 'origin/master' into ci-permissions
# Conflicts:
#	app/views/projects/builds/index.html.haml
2016-02-04 13:16:48 +01:00
Kamil Trzcinski d231b6b918 Add behaviour tests for build permissions 2016-02-04 13:13:01 +01:00
Kamil Trzcinski b4c36130cc Rename allow_guest_to_access_builds to public_builds 2016-02-04 12:57:46 +01:00
Stan Hu d20e75a8d8 Support Akismet spam checking for creation of issues via API
Currently any spam detected by Akismet by non-members via API will be logged
in a separate table in the admin page.

Closes #5612
2016-02-02 11:25:44 -02:00
Rubén Dávila 9ef468922c Merge branch 'master' into issue_5546 2016-01-22 17:54:37 -05:00
Rubén Dávila 0f79620ccb Little refactor plus some specs. 2016-01-21 12:54:10 -05:00
Rémy Coutable 82571eab43 Fix failing specs 2016-01-21 10:08:12 +01:00
Douwe Maan b4faa59728 Merge branch 'issue_3749' into 'master'
Update Issues/MRs updated_at field when notes are generated

Closes #3749 and #9130

See merge request !2493
2016-01-20 15:06:49 +00:00
Rubén Dávila 78754cb1c9 Update Issues/MRs updated_at when user leaves comments. 2016-01-18 21:39:23 -05:00
Grzegorz Bizon d9629a0cf0 Add specs for CI Lint button exposed on a builds page 2016-01-17 16:57:42 +01:00
Grzegorz Bizon 6a504c8256 Add feature tests for permissions for build artifacts read ability 2016-01-15 13:56:43 +01:00
Dmitriy Zaporozhets 620d8b68a1
Merge branch 'remove-gray-bg'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-14 14:09:49 +01:00
Grzegorz Bizon 09c82c6fdc Add spinach feature specs for build artifacts browser 2016-01-14 12:48:15 +01:00
Grzegorz Bizon e5d2a81b86 Add basic spinach tests for project builds 2016-01-14 12:48:15 +01:00
Rémy Coutable e918493f55 Fix specs and rubocop warnings 2016-01-14 10:04:48 +01:00
Dmitriy Zaporozhets 6a40718b9e
Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-13 20:41:43 +01:00
Rémy Coutable 5e452d3794 Improve & adds specs for Issue/MR references
- Improve specs for private Issue/MR referenced in public Issue
- Add specs for private Issue/MR referenced in public MR
2016-01-13 17:05:54 +01:00