home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 11:36:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,590 Commits 48 Branches 340 Tags
4ffa34a4d69930fa2c8f4ac8f4d7e6aa79102ced
Commit Graph
157 Commits
Author SHA1 Message Date
Douwe Maan f709f76877 Make sure test license is setup in all tests. 2015-05-07 20:01:45 +02: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
Stan Hu b26ab0ceeb This MR extends the commit calendar so it searches for commits made with every email address the user has associated with his account. 
This fixes one of the problems mentioned in gitlab-org/gitlab-ce#1162 and makes the behavior of the commit calendar as described in the profile.
"All email addresses will be used to identify your commits."
 2015-03-09 21:43:54 -07:00
Robert Speicher 7194810892 TestEnv improvements 
- Simplify cleaning the temporary testing path in TestEnv
- Don't run gitlab:shell:install if it's already installed
- Run git commands quietly
 2015-02-16 20:36:34 -05:00
Jeroen van Baarsen 0c4a70a306 Updated rspec to rspec 3.x syntax 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 19:17:35 +01:00
Dmitriy Zaporozhets f31a96104f Add flatten-dir branch to seed repo 2015-01-10 22:48:16 -08:00
Dmitriy Zaporozhets f7bf892cca Revert "gitlab shell works if multiple rubies installed" 
This reverts commit 533f4cdf30.
 2014-11-18 17:14:36 +02:00
Ciro Santilli 533f4cdf30 gitlab shell works if multiple rubies installed 
Before this it would fail because git hooks automatically prepend
things to the path, which can lead the wrong Ruby version to be called
in which dependencies are not installed.

To make sure that this is correct, the forked_merge_requests commented
out test that depends on this change was uncommented.

For that test to pass, it is also necessary to setup the mock server
on port 3001 under test_env.rb.
 2014-11-18 11:38:23 +01:00
Valeriy Sizov 70122e46c8 Merge pull request #7903 from cirosantilli/test-seed-reset 
Fix version of test seed branches to specific revisions. Only clone if necessary.
 2014-11-05 15:22:37 +02:00
Dmitriy Zaporozhets 0189be0831 Use short_id instead of [0..N] for short version of commit sha 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 15:39:48 +03:00
Vinnie Okada fecd9c0cb2 Add specs for tasks 
Add tests for the new task list functionality in the Markdown parser and
in issues and merge requests.
 2014-10-05 22:15:36 -05:00
Vinnie Okada 088987e2dd Make Mentionables work for cross-project refs 
Add a note to merge requests and issues when they're mentioned by a
merge request, issue, or commit in another project.
 2014-10-03 12:30:20 -05:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Ciro Santilli 9567778f94 Fix version of test seed branches. 2014-10-01 08:56:04 +02:00
Ciro Santilli b49dd2c573 Replace testme with gitlab-test. 2014-09-27 10:11:20 +02:00
Ciro Santilli 89f7345f3f Remove unnecessary page. from tests. 2014-09-26 09:51:17 +02:00
Ciro Santilli 065ab3e5f3 Only clone GitLab Shell on tests if necessary. 2014-09-22 21:37:52 +02:00
Dmitriy Zaporozhets 8f1e60b057 Fix satellite tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-06 09:52:56 +03:00
Dmitriy Zaporozhets 72053703e8 Fix API repository specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-01 15:41:02 +03:00
Dmitriy Zaporozhets 394ac378f8 Fix markdown tests. Use new repo for testing. Fixed gitlab-shell test setup 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 23:05:30 +03:00
Dmitriy Zaporozhets 7783f5ec73 Improve copy test repo cmd 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 21:30:35 +03:00