home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
94 Commits
Author SHA1 Message Date
Douwe Maan 065375ca2d Use "Build passed" in tooltip instead of "Build status: passed" 2015-12-08 21:43:52 +01:00
Douwe Maan d0ec28827d Fix specs 2015-11-18 12:02:09 +01:00
Kamil Trzcinski 2d0fcb4de2 Fix spinach tests introduced by 07101cfab6 2015-10-14 17:27:29 +02:00
Dmitriy Zaporozhets 353d426e4e Show CI status on Your projects page and Starred projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-24 14:00:23 +02:00
Dmitriy Zaporozhets 774c523c1f Fix tests and update CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-02 20:02:26 +02:00
Artem Sidorenko e238a8dad5 Import sources: show only enabled sources 2015-08-20 12:13:22 +02:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' " 
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
 2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets 9f10943c1a Revert "Merge branch 'drop-satellites'" 
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 10:28:42 +02:00
Dmitriy Zaporozhets fa88f2c084 Use real branches from test repo 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-16 17:09:20 +02:00
Dmitriy Zaporozhets 2be3c94925 Fix application initialize 2015-07-15 15:59:38 +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 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
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
Robert Speicher 584f8601ef Change within to page.within in feature steps 2015-06-12 05:12:42 -04:00
Robert Speicher 69bbc413fe Update all should-style syntax to expect in features 2015-06-12 05:12:09 -04:00
Dmitriy Zaporozhets a1c45338f3 Merge branch 'support-edit-target-branch-in-mr' into 'master' 
Support editing target branch of merge request

### What does this MR do?

This MR makes it possible to edit the target branch of a merge request and adds a system note when this happens.

### Why was this MR needed?

Because lots of people requested this feature. :)

### Screenshots

**Edit MR page**

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9b3d405bf7b5f945e35bae3534c2b67b/image.png)

**New MR page**

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3657a2a9efad6d10e8470637d1166bdb/image.png)

**System note**

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cc8066f3d3bdf09c0cce27193210567d/image.png)

### What are the relevant issue numbers?

* Closes https://github.com/gitlabhq/gitlabhq/issues/7105
* See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130!

See merge request !738
 2015-05-29 15:01:54 +00:00
Dmitriy Zaporozhets 85de253ee1 Fix tests for group leave feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-29 15:07:04 +02:00
Stan Hu 5e4384ec9b Support editing target branch of merge request 
Closes https://github.com/gitlabhq/gitlabhq/issues/7105
See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130
 2015-05-29 04:08:08 -07:00
Robert Speicher a11b07f31d Fix "Dashboard > New project" feature 2015-04-25 14:26:04 -04:00
Robert Speicher ef47ea3d39 Revert "Fix and improve help rendering" 
This reverts commit d365004e68.
 2015-04-15 12:24:44 -04:00
Dmitriy Zaporozhets 5d1ab47bd2 Revert help link tests removal 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-15 12:13:49 +03:00
Hannes Rosenögger a62dbd11cb fix failing test 2015-04-13 23:43:11 +02:00
Hannes Rosenögger a9306613f6 The help link has been removed. The commit removes the test for it. 2015-04-13 22:46:18 +02:00
Sullivan SENECHALandSullivan SENECHAL d365004e68 Fix and improve help rendering 2015-04-03 11:56:50 +02:00
Dmitriy Zaporozhets c1c93f4f7a Fix tests and unassigned filter for issues. Updated CHANGELOG 2015-03-27 00:27:51 -07:00
Stan Hu 90cbb73ed6 Fix "Import projects from" button to show the correct instructions 
Closes #1267
 2015-03-22 08:47:22 -07:00
Dmitriy Zaporozhets 0414b2ae98 Remove projects page from dashboard 2015-03-10 16:03:37 -07:00
Dmitriy Zaporozhets 8527e8d599 Fix test for creating group from dashboard 2015-03-10 15:19:28 -07:00
Dmitriy Zaporozhets b8d73315f5 Add tests for starred projects page 2015-03-09 14:25:14 -07:00
Dmitriy Zaporozhets 7e4258777f Move Profile groups tests to Dashboard group tests 2015-03-08 20:52:22 -07:00
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9 
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
 2015-02-19 20:53:05 -07:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9 
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
 2015-02-14 11:09:23 -07:00
Douwe Maan 421e882ea4 Fix specs. 2015-02-13 14:43:31 +01:00
Dmitriy Zaporozhets 97d7c06f78 Fix scroll problems and disable authorized_only filter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 12:56:03 +02:00
Dmitriy Zaporozhets 7b792af872 Improvements to issues/mr filters: 
* use filter_params variable when set filter values
* fix project issues spinach tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 11:39:03 +02:00
Ciro Santilli c3be1517ae Factor '0' * 40 blank ref constants 2014-11-03 20:37:08 +01:00
Marin Jankovski 5e017a4566 Assigned merge request should show on dashboard mr overiew feature spec. 2014-10-27 09:53:35 +01:00
Marin Jankovski 93532432dc Failing feature for dashboard merge requests when user has authored issues on forked project source. 2014-10-27 09:30:39 +01:00
Marin Jankovski d747612385 Failing feature for dashboard issues when user has authored issues on projects he is not a member of. 2014-10-27 09:20:43 +01:00
Ciro Santilli fa34901237 Make Spinach test names consistent 
- do not add Feature to feature titles
- titleize feature titles
- put steps on the same path as .feature files
- make feature titles match their path
 2014-10-05 18:21:11 +02:00
Ciro Santilli a92f48f615 Remove def project from tests that inherit it. 2014-09-28 13:44:04 +02:00
Ciro Santilli 89f7345f3f Remove unnecessary page. from tests. 2014-09-26 09:51:17 +02:00
Dmitriy Zaporozhets c31c8c55a4 Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/markdown_render.rb
 2014-09-22 20:56:12 +03:00
Dmitriy Zaporozhets fbdf34d7ab Merge pull request #7821 from cirosantilli/factor-spinach-classes 
[factor] Prefix Spinach features with Spinach::Features::.
 2014-09-22 20:54:37 +03:00
Ciro Santilli de6c8778f7 Prefix Spinach features with Spinach::Features::. 2014-09-22 16:30:25 +02:00
Ciro Santilli ef6e94e37e Replace old spinach step definitions with step. 2014-09-22 10:01:50 +02:00
Dmitriy Zaporozhets 6485570482 Increase atom feed test coverage. Prevent 500 error if description is missing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-20 11:55:58 +03:00
Robert Schilling 0cbc19f944 Awesome shortcuts for GitLab 2014-09-01 11:49:17 +02:00
Dmitriy Zaporozhets c3ad51a0e4 Improve search tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 10:48:51 +03:00