Commit Graph

101 Commits

Author SHA1 Message Date
Clement Ho c4094b7ec4 Fix specs 2017-05-04 22:34:15 -05:00
Valery Sizov 387c4b2c21 Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
Rémy Coutable 3855751d02
Merge branch 'jacopo-beschi/gitlab-ce-29712-unnecessary-wait-for-ajax'
See merge request !10567

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-04-24 18:06:47 +02:00
Rémy Coutable 8e6dabb011 Merge branch 'rs-empty-project-features' into 'master'
Use `:empty_project` where possible in top-level feature specs

See merge request !10836
2017-04-24 14:57:31 +00:00
Jacopo ff76adb547 Unnecessary "include WaitForAjax" and "include ApiHelpers"
Removed all the unnecessary include of `WaitForAjax` and `ApiHelpers` in the specs.
Removed unnecessary usage of `api:true`
2017-04-21 22:32:02 +02:00
Nur Rony b8a6338032 Adding animation for all dropdown 2017-04-21 15:05:38 +00:00
Robert Speicher aef345024f Use `:empty_project` where possible in top-level feature specs 2017-04-20 17:30:55 -04:00
Luke "Jared" Bennett 115d1afeb3 Only add newlines for multiple uploads 2017-04-14 15:30:43 +01:00
Regis Boudinot 1c783007e6 Issue title realtime 2017-04-06 01:13:06 +00:00
Eric Eastwood 5107f6b304 Fix linking to new issue with selected template
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/26595
2017-03-29 14:12:12 -05:00
Sam Rose aea78ded34 Redirect to signin when New Issue for not logged in 2017-03-20 10:43:54 -04:00
Robert Speicher 2858bc2037 Add feature specs for three types of user uploads 2017-02-24 16:41:27 -05:00
Douwe Maan 7d4b52b27d Enable Style/WordArray 2017-02-23 09:32:41 -06:00
Luke "Jared" Bennett 9f322f2b38
Added double newline after file upload markdown insert 2017-02-22 18:05:51 +00:00
Felipe Artur 4e84ec8a9e Fix 'reset-email' link spec 2017-02-16 17:36:59 -02:00
Phil Hughes 5942247dd6 Fixed missing edit link click 2017-02-06 09:25:11 +00:00
Phil Hughes 8331036944 Fixed some specs
CHANGELOG item
2017-02-06 09:25:11 +00:00
Alfredo Sumaran 55fe57ebe6 Wait for ajax after clicking on a date 2017-01-05 17:40:42 -05:00
Mike Greiling 637dafde1d add rspec feature test 2017-01-02 14:24:30 -06:00
Adam Niedzielski 65322905d5 Improve spec for resetting incoming email token 2016-12-23 16:42:44 +01:00
Luke "Jared" Bennett a08fba63be
Added empty state svg and set up blank conditional
Added new spec step

Added empty state to dashboard

Split empty and filtered empty states

Moved empty_state icons into their own folder and DRY up empty state html

Fixed failing spec

Added to groups page

Review changes
2016-11-18 03:57:36 +00:00
tiagonbotelho 011e561bfa implements reset incoming email token on issues modal and account page,
reactivates all tests and writes more tests for it
2016-11-07 15:56:18 +00:00
Phil Hughes cc88fa4d5b Merge branch 'master' into revert-c676283b 2016-10-03 09:10:20 +01:00
Phil Hughes b13213e6be Send ajax request for label update only if they are changed (#19472 !5071) 2016-09-27 10:23:15 -05:00
Luke Bennett 56461e0c16
Reordered dropdown options
Rearranged datetime created line

Added `avatar_class` option to `link_to_member` so it can be hidden

Made snippet title font heavier

Added file title  bar

Hidden unneeded info from xs screens

Added visibility icon

Reveal file-actions on xs screens

Added comments icon to snippets list items

Refactored no-comments declaration into framework stylesheet

Final touch ups

Fixed snippets_spec
2016-09-07 15:12:03 +01:00
Phil Hughes 7418873b41 Merge branch 'master' into revert-c676283b 2016-08-30 11:21:29 +01:00
Valery Sizov 8f9a7ca854 Revert the revert of Optimistic Locking 2016-08-22 18:43:13 +03:00
Douwe Maan 97dddf39cd Disable “issue by email” feature until it uses a different token 2016-08-19 19:49:12 -05:00
tiagonbotelho 519275c110 fixes part1 of files to start using active tense 2016-08-09 15:06:23 +01:00
zs 84a3225b0c State specific default sort order for issuables
Provide more sensible default sort order for issues and merge requests
based on the following table:

| type           | state  | default sort order |
|----------------|--------|--------------------|
| issues         | open   | last created       |
| issues         | closed | last updated       |
| issues         | all    | last created       |
| merge requests | open   | last created       |
| merge requests | merged | last updated       |
| merge requests | closed | last updated       |
| merge requests | all    | last created       |
2016-08-01 11:28:56 +02:00
Lin Jen-Shin d2b026f092 Test both for having existing issues or not 2016-07-27 18:07:24 +08:00
Lin Jen-Shin 1b1e3ae425 Update the description a bit 2016-07-26 19:01:58 +08:00
Lin Jen-Shin 53e64926b4 Test if we're showing the modal and has the right email 2016-07-26 19:00:36 +08:00
Phil Hughes f0691ec7c5 Revert "Merge branch 'revert-bdb6f1e6' into 'master'"
This reverts merge request !5290
2016-07-20 10:48:02 +01:00
Douwe Maan 2735e5f1c2 Revert "Merge branch 'gl-dropdown-issuable-form' into 'master'"
This reverts merge request !4970
2016-07-15 23:46:29 +00:00
Robert Speicher d4677353b8 Merge branch 'revert-lock-for-issuable' into 'master'
Revert "Optimistic locking for Issue and Merge Requests"

The migration to add `lock_version` in !5146 to every issue and merge request takes too long on GitLab.com since it has to add a default value of 0 to every row. Unfortunately, Rails 4.2 doesn't work properly if the value is left as `nil`; anything using optimistic locking cannot be edited. 

This bug was fixed in Rails 5.0 via this commit: 13772bfa49. I suggest we revert this change for now, and when we upgrade to Rails 5.0 we can reintroduce this feature.

See merge request !5245
2016-07-15 18:29:50 +00:00
Jacob Schatz bdb6f1e6fa Merge branch 'gl-dropdown-issuable-form' into 'master'
GL dropdowns in issuable form

## What does this MR do?

Changed all the issuable dropdown menus over to user GL dropdowns. This brings the dropdowns to be inline with the issuable filter dropdowns and allows for labels to be created whilst creating/editing an issuable.

## What are the relevant issue numbers?

Closes #12574 

## Screenshots (if relevant)


See merge request !4970
2016-07-15 02:29:10 +00:00
Stan Hu d7c5919158 Revert "Optimistic locking for Issue and Merge Requests"
This reverts commit c39356998b.
2016-07-13 19:17:17 -07:00
Valery Sizov c39356998b Optimistic locking for Issue and Merge Requests 2016-07-12 19:52:14 +03:00
Phil Hughes a6b4164017 Updated tests 2016-07-07 09:38:49 +01:00
Grzegorz Bizon 9e211091a8 Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
Grzegorz Bizon 28bafd5354 Enable Style/SpaceAfterComma Rubocop cop 2016-06-29 15:23:44 +02:00
Jacob Schatz 05dcec95aa Make tests pass. 2016-06-17 11:52:22 +01:00
Jacob Schatz 3ff1b4c98e Fix spec issue 2016-06-17 11:52:22 +01:00
Jacob Schatz bb1c0e88ae Merge branch 'issuable-sidebar-bold' into 'master'
Fixed issue with bold in issuable sidebar

## What does this MR do?

~~The sidebar contained both normal font weight & bold font weight, so this standardises them to bold.~~

After looking at the designs, i've updated the font weights & colors throughout the sidebar to correctly match them

## Screenshots (if relevant)

![Screen_Shot_2016-06-02_at_11.03.40](/uploads/0a3eb6a67ce5722c77f6adf2fe883017/Screen_Shot_2016-06-02_at_11.03.40.png)


See merge request !4398
2016-06-15 20:29:50 +00:00
Phil Hughes 342434c886 Fixed issue with de-selecting dropdown option in issue sidebar
Closes #18641
2016-06-15 12:40:22 +01:00
Phil Hughes b0cf82105b Fixed tests 2016-06-10 10:41:58 +01:00
Phil Hughes 7c88141b95 Fixed tests 2016-06-09 16:24:40 -04:00
Phil Hughes 515a5aeb33 Fixed JS errors
CHANGELOG item
2016-06-05 16:15:51 -04:00
ZJ van de Weg 7ae536002a Merge branch 'master' into awardables 2016-05-25 14:41:25 +02:00