Commit Graph

333 Commits

Author SHA1 Message Date
Jose Ivan Vargas 3225fd3688 Removed the settings gear button inside the Project to a tab 2017-03-07 23:26:57 -06:00
Kushal Pandya 6a2516f978 Restore keyboard shortcuts for "Activity" and "Charts" 2017-03-06 23:52:57 +00:00
Dmitriy Zaporozhets c13c1e1b16
Improve explore projects spinach test
Project name "Internal" is too generic and can lead to false
positive/negative when there is a visibility filter on the page. So we
ensure we check for project inside list holder css class.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-03-04 15:30:12 +02:00
Kushal Pandya 52352be6be Cleaning up navigational order - Project 2017-03-02 17:57:01 +00:00
Douwe Maan 030baf70d2 Enable Performance/RedundantMerge 2017-02-23 09:31:57 -06:00
Grzegorz Bizon 953e590b18 Make build clone/retry implementation more robust 2017-02-16 13:13:10 +01:00
James Edwards-Jones 1af3f3b673 Merge branch 'master' into jej-pages-picked-from-ee 2017-02-03 17:25:26 +00:00
Filipa Lacerda c5f5ce8807 Fix broken tests
Rename Build to Job

Replace "Builds" by "Jobs" and fix broken specs

Replace "Builds" by "Jobs"

Fix broken spinach test

Fix broken test

Remove `˙` at the beginning of the file

Fix broken spinach test

Fix broken tests

Changes after review
2017-02-03 09:43:04 +00:00
Kamil Trzcinski 639cf728f8 Fix adding pages domain to projects in groups 2017-01-31 22:55:30 +00:00
Rémy Coutable 34ef6ce3d3 Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master'
Moved the webhooks and services gear options to a single one called integrations

See merge request !8380
2017-01-20 10:05:19 +00:00
Fatih Acet 97475d0b8d Merge branch '24032-changed-visibility-level-to-public-but-project-is-not-public' into 'master'
Update project visibility level ui to use dropdowns

Closes #24296, #24123, and #24032

See merge request !7645
2017-01-19 13:03:18 +00:00
Jose Ivan Vargas 1ee4f98694 Fixed spinach feature tests for the services and hooks controllers
Added a test for the integrations controller
2017-01-18 15:19:35 -06:00
Robert Speicher 822bf2f91c Add the `:repository` trait to `:project` factories in Cucumber steps 2017-01-17 16:02:08 -05:00
Semyon Pupkov cec230bdf5 Move admin groups spinach tests to rspec
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2016-12-27 00:36:33 +05:00
jurre a0c48ec62b Move Admin Appearance spinach feature to rspec 2016-12-19 17:41:54 +01:00
Semyon Pupkov 5a6252ff4a Move admin application spinach test to rspec
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2016-12-17 17:45:10 +05:00
Sean McGivern 4bf61b8bd4 Merge branch 'jej-24637-move-issue-visible_to_user-to-finder' into 'security'
Issue#visible_to_user moved to IssuesFinder

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

See merge request !2039
2016-12-15 11:41:04 -03:00
Sean McGivern b70b962892 Merge branch 'dz-fix-admin-routes' into 'master'
Add support for nested groups to admin routing

See merge request !8008
2016-12-14 15:09:54 +00:00
jurre 0469e7dffd Move admin settings spinach feature to rspec 2016-12-13 17:13:21 +01:00
Dmitriy Zaporozhets d8b7df3cbc Add support for nested groups to admin routing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-12-11 10:30:10 +02:00
Luke "Jared" Bennett 2c9bb13505
Fixed tests
Grab permissions description from backend

Review changes

Added unit tests
2016-12-10 17:28:36 +00:00
Z.J. van de Weg 1096040024 Update effected tests 2016-12-04 17:32:33 +01:00
Mike Greiling 131a04d796 remove underscore from user-content id namespace 2016-11-30 15:28:11 -06:00
Mike Greiling 567b8a99fe update gitlab flavored markdown tests to reflect namespaced ids 2016-11-30 15:28:10 -06:00
David Wagner b3ed4e0cf9 Homogenize dropdowns on Issue page
Make sort and filter dropdowns look the same and tweak their icon and
colors according to #24150.

Signed-off-by: David Wagner <david@marvid.fr>
2016-11-28 23:18:03 +01:00
Robert Speicher fe4ae12ec8 Merge branch 'rephrase-system-notes' into 'master'
Rephrase some system notes to be compatible with new system note style

See merge request !7692
2016-11-25 04:36:13 +00:00
Douwe Maan 6df22f72c6 Rephrase some system notes to be compatible with new system note style 2016-11-24 18:26:29 +08:00
Dmitriy Zaporozhets 6683fdcfb0
Add nested groups support to the routing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-11-23 14:08:36 +02:00
the-undefined dbf5c8abfe Move 'Search Snippets' Spinach feature to Rspec
This commit moves the `search_snippets.feature` Spinach test to a
Rspec feature, as part of deprecating the Spinach test suite.

- Remove Spinach discover snippets feature and steps
- Remove unused `SharedSearch` module
- Add Rspec feature scenarios
2016-11-16 06:52:43 +00:00
Annabel Dunstone Gray 5d0f68f26b Fix diff_comments failure 2016-11-04 11:23:58 -05:00
Annabel Dunstone Gray 441948f438 Fix spinach tests 2016-11-01 10:58:07 -05:00
Dmitriy Zaporozhets 82033e2edc
Wait for ajax for every merge request spinach test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-18 18:55:11 +03:00
Dmitriy Zaporozhets 052de0600c Merge branch 'fix-trending-projects-spinach-failure' into 'master'
Fix trending projects Spinach failure

The trending projects list is now pre-calculated. To make this work with the Spinach test, we have to manually refresh the list.
    
Partial fix to #23378

See merge request !6911
2016-10-17 08:29:08 +00:00
Dmitriy Zaporozhets 9e30b75e9c
Fix merge requests feature tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-16 20:40:52 +03:00
Stan Hu 5b5c7e048b Fix trending projects Spinach failure
The trending projects list is now pre-calculated. To make this work
with the Spinach test, we have to manually refresh the list.

Partial fix to #23378
2016-10-14 16:58:55 -07:00
Felipe Artur 892dea6771 Project tools visibility level 2016-09-01 11:47:59 -03:00
Clement Ho 77abf8cccf Capitalize mentioned issue timeline notes 2016-08-25 10:47:40 -05:00
Phil Hughes f668da11cb Updated tests 2016-08-13 00:57:40 -05:00
Kamil Trzcinski 4ccf39cde7 Fix test failures, that did occur because of missing previously used `reload_status!` call 2016-08-11 22:54:25 +02:00
Kamil Trzcinski 6a6a69f4af Use state machine for pipeline event processing 2016-08-11 21:32:16 +02:00
Kamil Trzcinski 39203f1adf Pre-create all builds for Pipeline when a trigger is received
This change simplifies a Pipeline processing by introducing a special new status: created.
This status is used for all builds that are created for a pipeline.
We are then processing next stages and queueing some of the builds (created -> pending) or skipping them (created -> skipped).
This makes it possible to simplify and solve a few ordering problems with how previously builds were scheduled.
This also allows us to visualise a full pipeline (with created builds).

This also removes an after_touch used for updating a pipeline state parameters.
Right now in various places we explicitly call a reload_status! on pipeline to force it to be updated and saved.
2016-08-11 15:22:35 +02:00
Jacob Schatz 0452e0a57e Merge branch 'master' into faster-diffs 2016-07-11 17:19:17 -04:00
Douwe Maan 5a8f727fd5 Merge branch 'master' into faster-diffs
# Conflicts:
#	app/helpers/notes_helper.rb
#	app/views/projects/diffs/_line.html.haml
#	app/views/projects/diffs/_parallel_view.html.haml
#	app/views/projects/diffs/_text_file.html.haml
#	features/steps/shared/diff_note.rb
2016-07-07 18:05:34 -04:00
Jacob Schatz 5541e55c49 Merge branch 'issues-blank-state' into 'master'
Added blank state to issues

## What does this MR do?

Adds new blank state to issues when no issues exist.

Part of #18519 

## Screenshots (if relevant)

![Screen_Shot_2016-06-24_at_16.37.12](/uploads/0c3f385615b29216ef1137bd6fac06af/Screen_Shot_2016-06-24_at_16.37.12.png)

See merge request !4908
2016-07-07 21:17:23 +00:00
Douwe Maan 29d574868a Display new diff notes and allow creation through the web interface 2016-07-06 18:51:00 -04:00
Luke "Jared" Bennett 50dfdf0296 fix up tests
Added more exceptions

Added handling inline view type
2016-07-06 08:29:57 +02:00
Jacob Schatz e065f4848b Diffs will create button/diff form on demand no on server side 2016-07-06 08:29:57 +02:00
Phil Hughes 5fcf475bc6 Updated tests 2016-07-05 09:06:38 +01:00
Grzegorz Bizon 9e211091a8 Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
Stan Hu 59fc1816d3 Rename Repo -> Repository 2016-06-21 07:54:02 -07:00