home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 10:36:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,647 Commits 48 Branches 340 Tags
758ea7520e69feeac4ffdf2a9e4e2752e5ff91fb
Commit Graph
176 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets ae713ae8fc Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
	doc/README.md
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.12.md
	doc/workflow/README.md
 2015-06-17 11:25:59 +02:00
Robert Speicher b00f447db4 Add allowing_for_delay helper method for feature specs 2015-06-14 20:33:29 -04:00
Robert Speicher 44d6815999 Allow login_as helper to accept a User object 2015-06-13 17:58:15 -04:00
Dmitriy Zaporozhets f840903112 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/helpers/tab_helper.rb
	app/models/merge_request.rb
	app/views/layouts/nav/_project_settings.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	doc/api/groups.md
 2015-06-12 11:16:28 +02:00
Dmitriy Zaporozhets 962fe84e49 Fix logout scenario 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-10 16:01:44 +02:00
Robert Speicher 1f9a2ab7c9 Memoize result of JSON.parse in json_response 
This might see a minor speedup in test cases that call this method many
times.
 2015-06-10 01:31:27 -04:00
Robert Speicher 57830201a9 Add spec/support files for WebMock and test coverage 2015-06-10 01:31:27 -04:00
Robert Speicher 47251b85e0 ensure_length_of -> validate_length_of 2015-06-10 01:31:26 -04:00
Dmitriy Zaporozhets ada2be3c21 Fix spinach tests and some specs after merge CE into EE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 15:24:36 +02:00
Dmitriy Zaporozhets 935fc796d1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb
 2015-06-05 11:40:36 +02:00
Dmitriy Zaporozhets 79aac2c128 Merge branch 'ignore-references' into 'master' 
Don't notify users mentioned in code blocks or blockquotes.

cc @rspeicher

See merge request !753
 2015-06-02 18:39:18 +00:00
Robert Speicher 79c4e3899f Rename ReferenceFilterSpecHelper to FilterSpecHelper 
And make it more generalized for all filter specs.
 2015-06-02 13:27:53 -04:00
Douwe Maan a916936f3f Fix spec. 2015-06-02 15:00:51 +02:00
Robert Speicher 94af050117 Use to_reference in reference filter specs 2015-05-26 15:48:32 -04:00
Robert Speicher 91eb346de6 Add invalidate_reference to ReferenceFilterSpecHelper 2015-05-26 15:48:31 -04:00
Robert Speicher 3b80cf524c Use to_reference in Mentionable shared examples 2015-05-26 15:48:30 -04:00
Dmitriy Zaporozhets b2d45bb544 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/controllers/uploads_controller.rb
	app/helpers/application_helper.rb
	app/models/note.rb
	app/services/test_hook_service.rb
	db/schema.rb
	spec/models/note_spec.rb
 2015-05-13 14:10:14 +03:00
Douwe Maan f709f76877 Make sure test license is setup in all tests. 2015-05-07 20:01:45 +02:00
Robert Speicher 1108915f75 Change wording for task list summaries 2015-05-06 17:27:10 -04:00
Robert Speicher e167f28549 Update Taskable to use TaskList 2015-05-06 12:58:28 -04:00
Douwe Maan c9d1a9d096 Move license setup to spec/support. 2015-05-05 15:20:28 +02:00
Douwe Maan 97bfd764b7 Add feature specs for license upload. 2015-05-05 14:13:57 +02:00
Douwe Maan 2bb2ade50d Merge branch 'master' into license 
# Conflicts:
#	db/schema.rb
 2015-05-05 13:03:33 +02:00
Douwe Maan e715489882 Setup license in test env. 2015-05-05 12:44:06 +02:00
Douwe Maan 68ac20604b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	app/controllers/groups/application_controller.rb
#	app/services/test_hook_service.rb
#	app/views/admin/groups/show.html.haml
#	app/views/groups/_settings_nav.html.haml
#	app/views/groups/show.html.haml
#	app/views/layouts/_head.html.haml
#	app/views/projects/_settings_nav.html.haml
#	db/schema.rb
#	features/project/project.feature
#	features/steps/project/project.rb
 2015-05-05 10:18:27 +02:00
Robert Speicher 1c49809bf8 Don't delete gitlab-test-fork folder after every test run 2015-05-02 16:01:33 -04:00
Dmitriy Zaporozhets 6d22e96744 Merge branch 'fix-submodule-error-with-forked-project' into 'master' 
Fix "Revspec not found" errors when viewing diffs in a forked project with submodules

## What does this MR do?

This MR fixes an error that occurs when viewing diffs in a forked project with submodules.

### Are there points in the code the reviewer needs to double check?

Testing this code was tricky. The only way this problem shows up is if the origin project does NOT have the submodule update commit. The introduction of gitlab-test-fork serves that purpose: it contains a submodule update not present in gitlab-test.

### Why was this MR needed?

A user would receive a 500 error when trying to view a merge request with a submodule update. #1413 has details on how to reproduce this issue.

### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?

#1413

See merge request !512
 2015-04-30 16:47:35 +00:00
Dmitriy Zaporozhets 8140c68289 Merge branch 'rs-issue-2269' into 'master' 
Remove duplicate settings for default_url_options

Closes #2269

See merge request !1797
 2015-04-28 08:34:34 +00:00
Stan Hu 72a7febead Fix "Revspec not found" errors when viewing diffs in a forked project with submodules 
Closes #1413
 2015-04-27 20:42:38 -07:00
Robert Speicher e3d2304d69 Specs don't need to set default_url_options anymore 2015-04-27 15:47:05 -04:00
Dmitriy Zaporozhets 2e243fc321 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	README.md
	VERSION
	app/controllers/projects/services_controller.rb
	app/controllers/projects/uploads_controller.rb
	app/services/test_hook_service.rb
	db/schema.rb
	features/steps/admin/settings.rb
	lib/gitlab/reference_extractor.rb
	spec/models/note_spec.rb
 2015-04-27 11:53:31 +03:00
Robert Speicher 652c15b585 Don't use capybara-screenshot in CI environments 2015-04-25 21:33:17 -04:00
Robert Speicher 3875930793 Enable js_errors for Capybara in Spinach and RSpec 2015-04-25 21:33:16 -04:00
Robert Speicher 86edfce442 Move RSpec setup for Capybara to its own support file 2015-04-25 21:33:16 -04:00
Robert Speicher 89775da8e5 Add to_param to mentionable spec's mock 2015-04-25 14:40:40 -04:00
Robert Speicher 85082de780 Add pipeline_result to ReferenceFilterSpecHelper 2015-04-25 14:39:44 -04:00
Douwe Maan 077a8ec270 Fix tests. 2015-04-24 12:31:57 +02:00
Douwe Maan 889832578a Fix small issues. 2015-04-24 12:31:16 +02:00
Douwe Maan 0ff778c0f4 Link cross-project cross-reference notes to correct project. 2015-04-24 12:30:36 +02:00
Dmitriy Zaporozhets 97cf775753 Merge branch 'ce-to-ee' into 'master' 
CE to EE

See merge request !380
 2015-04-24 10:29:08 +00:00
Dmitriy Zaporozhets c30079f3f4 Merge branch 'rs-mentionable-examples-refactor' into 'master' 
Update mentionable shared examples to be (a bit) more understandable

These shared examples were super confusing, and honestly still kind of are, but they should be a bit better now.

I encountered a bunch of headaches in these examples while refactoring ReferenceExtractor, so that's how I ended up changing it.

See merge request !1780
 2015-04-23 20:50:48 +00:00
Marin Jankovski f72a81089f Test existing comment query. Add logging when testing jira service settings. 2015-04-21 20:02:59 +02:00
Robert Speicher 3a0b4340aa Add more tests for cross-project references 2015-04-20 13:01:46 -04:00
Robert Speicher 96c2b94048 Reference filters ✨ 
Commit ranges, commits, external issues, issues, labels, merge requests,
snippets, users.
 2015-04-20 13:01:42 -04:00
Robert Speicher e01480a3af Minor mentionable shared example change 2015-04-16 16:34:01 -04:00
Robert Speicher 8c9a148720 Update mentionable shared examples to be (a bit) more understandable 2015-04-16 16:30:16 -04:00
Robert Speicher dee52393b5 Correct usage of subject in specs 2015-04-16 16:30:16 -04:00
Dmitriy Zaporozhets 275f64fb86 Merge pull request #9044 from tsigo/rs-git-template-env 
Define GIT_TEMPLATE_DIR environment variable in TestEnv
 2015-03-29 03:40:56 -07:00
Robert Speicher 0f1d8e771f Define GIT_TEMPLATE_DIR environment variable in TestEnv 
See http://schacon.github.io/git/git-init.html#_template_directory

Without this variable, any global git hooks a developer might have in
~/.git_template would be linked in the `.git/hooks` folder for every
test repository that gets checked out by TestEnv, and would cause
certain specs to fail due to pre-existing hook files.
 2015-03-27 22:26:03 -04:00
Dmitriy Zaporozhets c1c93f4f7a Fix tests and unassigned filter for issues. Updated CHANGELOG 2015-03-27 00:27:51 -07:00