home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,081 Commits 48 Branches 340 Tags
1308a8a0ef27ea241301ab0585647761a2ffeb0e
Commit Graph
63 Commits
Author SHA1 Message Date
Valery Sizov 1308a8a0ef GHE: fix 2015-02-10 16:03:02 +02:00
Valery Sizov 45ec0d255d Merge remote-tracking branch 'ee/master' into ce_non_conflict 
Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
 2015-02-05 22:01:05 -08:00
Valery Sizov b3c90dd514 GitHub importer refactoring 2015-02-05 21:48:21 -08:00
Valery Sizov 2d5765bd2c gitlab.com importer: fix specs after refactoring 2015-02-05 12:50:34 -08:00
Valery Sizov 33349dd549 GitLab.com integration: refactoring 2015-02-05 12:50:34 -08:00
Valery Sizov 5194214e3a GitLab integration. Importer 2015-02-05 12:50:34 -08:00
Dmitriy Zaporozhets 9b140b22fb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee 
Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb
 2015-02-04 18:19:22 -08:00
Valery Sizov b9d9ac82a9 Commit page: async load branches info 
Conflicts:
	config/routes.rb
 2015-02-03 09:10:56 -08:00
Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb
 2015-01-29 11:34:43 -08:00
Dmitriy Zaporozhets 08582f1532 Improve user calendar authentification and tests 2015-01-29 08:55:57 -08:00
Dmitriy Zaporozhets a9288e554e Cleanup and make contribution calendar faster 2015-01-29 00:53:43 -08:00
Hannes Rosenögger 792ced2f41 Add a commit calendar to the user profile 2015-01-29 01:25:26 +01:00
Valery Sizov badfdf6634 Merge remote-tracking branch 'ee/master' into ce-non-conflict 
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/projects_helper.rb
	db/schema.rb
 2015-01-13 18:22:38 -08:00
Valery Sizov ee28ee5f13 rspec fix 2015-01-10 20:04:06 -08:00
Valery SizovandValery Sizov a9f7fd2c1a Github Importer 2015-01-10 09:51:43 -08:00
Jacob Vosmaer 11b3a05946 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-11-17 15:41:52 +01:00
Marin Jankovski 9eb571f0ea Add branch controller test. 2014-11-13 16:19:07 +01:00
Marin Jankovski a8b655a46e Fix unsubscribe controller spec. 2014-08-22 12:03:33 +02:00
Jacob Vosmaer ee8836a903 Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166 
Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb
 2014-08-15 10:25:23 +02:00
Jan-Willem van der Meer 3a42051d55 Use CGI encoding to ensure email address is transported correctly 
Tnx to @jacobvosmaer for the suggestion
source: http://stackoverflow.com/questions/4394381/rails-url-helper-not-encoding-ampersands
 2014-08-13 12:04:53 +02:00
Jan-Willem van der Meer 1dd995a763 Move tests as well, remove public namespace from controller 2014-08-12 17:56:29 +02:00
Jan-Willem van der Meer 725891d80f Do not display other behaviour if the email address does not exist 2014-08-12 17:47:01 +02:00
Jan-Willem van der Meer e0d6a086c1 Add request specs for unsubscribe 2014-08-11 13:37:21 +02:00
Dmitriy Zaporozhets a0755d2f05 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-07 20:46:17 +03:00
Dmitriy Zaporozhets b954f24420 Fix MR controller tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-06 09:07:11 +03:00
Ciro Santilli 9b5c7a4d60 Add star count, view logic, more tests. 2014-07-17 22:47:16 +02:00
Ciro Santilli 714f7201d3 Add project stars. 2014-07-17 22:47:16 +02:00
Marin Jankovski e87f238077 Add tests for redirects. 2014-07-08 20:25:25 +02:00
Ciro Santilli a7e0ca9e83 Add trailing newline to all text files. 
Present in the large majority of files of each respective type.
 2014-06-21 11:20:22 +02:00
Marin Jankovski 9b2a13497d Need txt file in test. 2014-05-26 15:58:03 +02:00
Marin Jankovski f8a6d3405e Add image_service spec. 2014-05-26 15:47:54 +02:00
Marin Jankovski 3b2b3cff04 Move logic to image_service. 2014-05-26 14:54:03 +02:00
Marin Jankovski 8bec6b0bcb Make existing tests test something, return correct errors. 2014-05-26 14:17:46 +02:00
Earle Bunao & Neil Calabrosoanderbunao 6a85cdf162 Implements drag and drop upload in creating issues 2014-05-23 16:22:42 +08:00
Dmitry Medvinsky fefab47456 Fix /:username.keys response content type 
Currently this method responds with `text/html`. It is kind of unusable
if you open it in a browser. The browser thinks it is HTML and renders
it as HTML, meaning new lines are dropped. So it's very hard to
distinguish where the key starts and where it ends.

This commit changes the content type header to `text/plain`.
 2014-03-20 19:09:14 +04:00
Johannes Schleifenbaum f10153818b Split the user ssh keys by newline, not the characters "\n" 
before:
GET /user.keys

ssh-rsa ...\nssh-rsa ...\nssh-rsa ...

after:
GET /user.keys

ssh-rsa ...
ssh-rsa ...
sha-rsa ...
 2014-02-11 19:24:23 +01:00
Dmitriy Zaporozhets c227aa44f9 Make changes to tests 
* project_with_code -> project
* project -> ermpty_project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 21:03:52 +02:00
Dmitriy Zaporozhets 09d5868c22 Fix mr controller specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 10:47:28 +02:00
Dmitriy Zaporozhets a9d7efa12f Remove invalid test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-09 15:16:10 +02:00
Dmitriy Zaporozhets f8f76fdbfd Merge pull request #5427 from karlhungus/feature_search_code_in_public_repos 
Allow public repo searching
 2014-01-09 00:24:46 -08:00
skv d89527839e fix most of warnings 2013-12-15 00:05:10 +04:00
Izaak Alpert b89d8497f6 Updated convience method to private 2013-11-13 15:07:53 -05:00
Izaak AlpertandIzaak Alpert 91c7b266cd Allow public repo searching 
GITLAB-1386

Change-Id: I9a0bbe8db1a9bb00cef33b3e1854d78844b70a45
 2013-11-13 14:56:35 -05:00
Izaak Alpert ca1b67ce38 Don't show users password change page if ldap users 2013-09-17 22:38:08 -04:00
Hiroyuki Sato df9cbbc924 Drop support of root namespace in routing 2013-09-13 07:00:24 +09:00
Dmitriy Zaporozhets a73e068c06 Fixing tests after adding iid for issues/mr 2013-08-20 16:56:05 +03:00
Dmitriy Zaporozhets 4537623d12 Merge branch 'master' into karlhungus-mr-on-fork 
Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb
 2013-08-08 12:22:09 +03:00
Dmitriy Zaporozhets 1e3f09b21f Fix tests 2013-08-05 18:29:44 +03:00
Izaak AlpertandIzaak Alpert 3d7194f011 Merge Request on forked projects 
The good:

 - You can do a merge request for a forked commit and it will merge properly (i.e. it does work).
 - Push events take into account merge requests on forked projects
 - Tests around merge_actions now present, spinach, and other rspec tests
 - Satellites now clean themselves up rather then recreate

The questionable:

 - Events only know about target projects
 - Project's merge requests only hold on to MR's where they are the target
 - All operations performed in the satellite

The bad:

  -  Duplication between project's repositories and satellites (e.g. commits_between)

(for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos)

Fixes:

Make test repos/satellites only create when needed
-Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap)
-project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually
-fixed remote removal
-How to merge renders properly
-Update emails to show project/branches
-Edit MR doesn't set target branch
-Fix some failures on editing/creating merge requests, added a test
-Added back a test around merge request observer
-Clean up project_transfer_spec, Remove duplicate enable/disable observers
-Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well
-Signifant speed ups for tests
-Update formatting ordering in notes_on_merge_requests
-Remove wiki schema update
Fixes for search/search results
-Search results was using by_project for a list of projects, updated this to use in_projects
-updated search results to reference the correct (target) project
-udpated search results to print both sides of the merge request

Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
 2013-07-17 22:41:30 -04:00
Dmitriy Zaporozhets 40bca5246b Fix routing/controller specs for refactored controllers 2013-06-23 20:25:06 +03:00