home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
63 Commits
Author SHA1 Message Date
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 44ac823e59 Improve tests to use real branches in merge requests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-04 17:20:26 +02:00
Robert Speicher 6e5473f930 Remove show actions from Admin and Project DeployKeys 2015-06-03 18:03:04 -04:00
Robert Speicher f46b367068 Add MergeRequests#commits action and route 
/:namespace_id/:project_id/merge_requests/:id/commits(.:format)
 2015-05-29 00:09:28 -04:00
Douwe Maan a243e44ca1 Fix failing specs. 2015-04-03 12:23:20 +02:00
Douwe Maan 31fc73f0a9 Use project_member instead of team_member. 2015-03-15 13:50:38 +01: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
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
Douwe Maan 639c93b4f2 Don't have Markdown preview fail for long content by using POST rather than GET. 
See https://github.com/gitlabhq/gitlabhq/issues/8611.
 2015-02-06 11:23:12 +01:00
Dmitriy Zaporozhets 90ba3a385c Fix tests for blobs refactoring 2015-01-26 16:08:59 -08:00
Hannes Rosenögger 70c44a0da2 Fix tests, merge conflicts, some minor issues and make the project avatar feature mergable 2015-01-24 18:51:16 +01:00
Steven ThonusandHannes Rosenögger 42bac7f9f2 adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix 2015-01-24 18:51:16 +01:00
Dmitriy Zaporozhets 6a5766e370 Merge pull request #7978 from cirosantilli/edit-preview-route-test 
Add tests for tree edit routes
 2014-12-20 20:17:25 +02:00
Dmitriy Zaporozhets 65b858a776 Merge branch 'show_files_with_diff_name' into 'master' 
Show files named diff

Fixes #1749

See merge request !1318
 2014-12-11 14:07:12 +00:00
Marin Jankovski 22368fb8e8 Add a failing route spec for file named diff. 2014-12-10 15:52:56 +01:00
Vinnie Okada 742e6eeed2 Merge branch 'upstream-master' into markdown-preview 
Conflicts:
	spec/routing/project_routing_spec.rb
 2014-12-07 20:25:58 -07:00
Dmitriy Zaporozhets d2c3c98e3c Routing specs for fork projects 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-14 12:55:13 +02:00
Vinnie Okada cd3eabd712 Use GET instead of POST for Markdown previews 2014-10-16 22:45:13 -05:00
Vinnie Okada 5700842ba8 Add Markdown preview to more forms 
Enable Markdown previews when creating and editing issues, merge
requests, and milestones, and when editing notes.
 2014-10-15 23:52:33 -05:00
Ciro Santilli f4efb19038 Add tests for tree edit routes 
Critical because of possible confusion between /:id/preview
and /:id for a path that ends in preview.
 2014-10-07 10:04:09 +02:00
Dmitriy Zaporozhets d593c98fcb Delete wall notes tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 14:29:26 +03:00
sue445 a3d8be09c6 Fix can not automerge if description is too long 2014-05-11 23:50:14 +09:00
Jason Hollingsworth 7cc2520541 Add support for various archive formats. 
Used mime-types gem instead of hardcoding content types.
Allow multiple extensions in archive route (.tar.gz, .tar.bz2).
Change content disposition from infile(?) to attachment for api.
Fixed api would return “archive” instead of {project}-{hash}.{ext}
 2014-01-02 10:18:56 -06:00
Peter Fern 05c988419f Expand refs constraints to include valid characters 
Fixes #4831, #4865, #4932
 2013-10-24 16:31:15 +11:00
Hiroyuki Sato df9cbbc924 Drop support of root namespace in routing 2013-09-13 07:00:24 +09:00
Dmitriy Zaporozhets d2284b4112 Fix routing specs 2013-07-17 08:43:56 +03:00
Dmitriy Zaporozhets ee890f2b2a Merge branch 'master' into 6-0-dev 
Conflicts:
	app/views/dashboard/projects.html.haml
	app/views/layouts/_head_panel.html.haml
	config/routes.rb
 2013-07-02 11:47:09 +03:00
Jack Weeden b62c9e5991 Prevent 'toplevel constant SnippetsController referenced by Project::SnippetsController' warning 2013-07-01 10:48:01 +01:00
Dmitriy Zaporozhets f438bd415f Merge branch 'master' into 6-0-dev 
Conflicts:
	app/controllers/admin/teams/projects_controller.rb
	app/views/team_members/_team_member.html.haml
	app/views/teams/members/_member.html.haml
 2013-06-30 11:35:40 +03:00
Yves Senn 3b9e3021ee fix bad constant reference in project_routing_spec.rb. 2013-06-24 18:57:49 +02:00
Dmitriy Zaporozhets 40bca5246b Fix routing/controller specs for refactored controllers 2013-06-23 20:25:06 +03:00
Dmitriy Zaporozhets e45179c9b4 remove useless routing tests. Added symlink creation for project with code 2013-06-22 18:57:34 +03:00
Dmitriy Zaporozhets 9ae26cd128 Merge pull request #4257 from jojosch/fix/routing-commit-with-# 
Routing fix Commit-List: branch with # and + in name
 2013-06-11 01:03:03 -07:00
Dmitriy Zaporozhets 038d40f0f5 Solve inconsistency between network graph & stat graphs 2013-06-11 09:54:01 +03:00
Johannes Schleifenbaum c830bab79a Commit List and Tree allow also + in branch name 2013-06-09 23:47:55 +02:00
Johannes Schleifenbaum 37ff9d88ec Routing fix Commit-List: switch to branch with # in name 2013-06-09 16:28:55 +02:00
Dmitriy Zaporozhets bcc4e4dc7e Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist 
Conflicts:
	Gemfile.lock
	app/models/ability.rb
	app/models/project.rb
	app/views/snippets/_form.html.haml
	db/schema.rb
	features/steps/shared/paths.rb
	spec/factories.rb
	spec/models/project_spec.rb
 2013-06-04 18:36:22 +03:00
Dmitriy Zaporozhets 8688789353 Merge pull request #3834 from ichord/gfm-autocomp 
improve gfm autocomplete
 2013-05-08 04:18:16 -07:00
Andrey Kumanyaev 67ccc8b52a Replace old hashes with new 1.9 ruby hashes (rebase) 2013-05-05 18:01:10 +04:00
ichord 439cd3ebd3 autocomplete issues and preload autocomplete data. 
update jquery-atwho-rails to v0.3.0

add autocomplete_source action to project for gfm autocomplete

move init_autocomplete layout from head_panel to project_resource
 2013-05-04 11:26:43 +08:00
Angus MacArthur ae33fdf297 updated fork feature to use gitlab-shell for v5 of gitlab 2013-04-15 01:54:52 -04:00
Dmitriy Zaporozhets 1743cbf1d8 Update capybara to 2.1, poltergeist to master 2013-04-11 10:45:18 +03:00
Dmitriy Zaporozhets 5577ee826d remove outdated routing specs 2013-04-07 21:18:48 +03:00
Andrew8xx8 b49cfbc1d5 Project snippets moved to /projects 2013-03-23 23:17:25 +04:00
Dmitriy Zaporozhets 2465a4fdb2 removed few outdated tests 2013-03-19 15:37:11 +02:00
Sato Hiroyuki 6224ac0647 Add and fix some tests for routing. 
It is linked to #2598.
 2013-03-06 16:36:01 +09:00
Yuri Feldman 918e2213e7 Test to show incorrect routing to Compare controller 2013-02-12 19:28:37 +11:00
Dmitriy Zaporozhets 315fd7d746 fix routing specs 2013-01-31 10:08:20 +02:00
Dmitriy Zaporozhets 31e3dc600a Fix routing specs 2013-01-09 09:47:25 +02:00