home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,827 Commits 48 Branches 340 Tags
c6db0e82cdc25bee7eece5b8ddbf8cb6fdc92d32
Commit Graph
257 Commits
Author SHA1 Message Date
Marin Jankovski 72139167dc Mockup of shared group memeber list at project member page. 2014-08-26 11:58:05 +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
skv 4e40800166 diff unfold 2014-08-14 15:48:14 +04:00
Dmitriy Zaporozhets fdd8e45075 Merge branch 'remove-remove-label' into 'master' 
Remove labels via ajax

See merge request !1019
 2014-08-13 18:28:52 +00:00
Dmitriy Zaporozhets 1d63464c82 Fix repository archive 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-13 21:28:22 +03:00
Dmitriy Zaporozhets 540596b7b5 Remove labels with ajax request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-13 19:47:03 +03:00
Dmitriy Zaporozhets 7122a823f8 Merge pull request #7393 from Razer6/fix_500_hook_service_down 
Prevent 500 if hook url is down when testing a hook, fixes #7376
 2014-08-11 12:41:35 +03:00
Dmitriy Zaporozhets 2ecc79507a Order labels by name 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 19:13:35 +03:00
Dmitriy Zaporozhets 593df8e69a Improve labels 
* allow developers to manage labels
* add ability to remove label

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 15:15:39 +03:00
Dmitriy Zaporozhets 048a21974e Add create/update to Labels controller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 13:12:11 +03:00
Dmitriy Zaporozhets b2a6f4e136 Refactor label rendering and default label set generation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 22:19:47 +03:00
Dmitriy Zaporozhets d79c0ea271 Allow set labels from Issue/MR forms 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 21:23:54 +03:00
Robert Schilling 7cefdb49eb Prevent 500 if hook url is down, fixes #7376 2014-07-29 11:49:46 +02:00
Dmitriy Zaporozhets 549655765a Fix variable order on compare page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 12:42:01 +03:00
Dmitriy Zaporozhets 378a3f5ca1 Use CompareService for compare page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 12:33:51 +03:00
Dmitriy Zaporozhets 67d5b95dd2 Merge pull request #7383 from Razer6/fix_test_hooks_empty_project 
Do not execute hooks on empty projects, fixes #6108
 2014-07-28 22:30:55 +03:00
Dmitriy Zaporozhets ddaa493ef3 Improve MR building 
* fix 500 error when no parent for initial commit
* fix link from diff files to wrong commit

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-28 20:54:40 +03:00
Robert Schilling 062ff17b1c Do not execute hooks on empty projects, fixes #6108 2014-07-27 23:48:53 +02:00
Dmitriy Zaporozhets 4a1e98e4b6 Merge pull request #6650 from lloeki/wiki_images_attachments 
Added ability to serve files in wiki repository
 2014-07-23 20:28:03 +03:00
Dmitriy Zaporozhets b03b69e23e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/images/brand_logo.png
	app/assets/stylesheets/sections/login.scss
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/appearances_helper.rb
	app/views/layouts/devise.html.haml
 2014-07-16 12:39:45 +03:00
Dmitriy Zaporozhets be5b6db883 Refactor diff suppress logic and diff views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 18:28:21 +03:00
Dmitriy Zaporozhets 45623089e2 Refactor MR build process 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 15:34:06 +03:00
Marin Jankovski 7435b879a6 Error message needs to be correct. 2014-07-14 12:11:01 +02:00
Marin Jankovski 207bc8a0e7 Branches without parent commit cannot be merged. 2014-07-14 11:06:14 +02:00
Dmitriy Zaporozhets 4ff1fc35d4 Remove attr_accessible from EE only models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 14:38:56 +03:00
Dmitriy Zaporozhets a74b66cdee Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/group.rb
	app/models/project.rb
	features/steps/shared/project.rb
 2014-07-10 23:43:42 +03:00
Dmitriy Zaporozhets 22995fc932 Merge branch 'redirect_betwee_tree_and_blob' into 'master' 
Redirect between tree and blob

This checks if on requested non-existing tree path blob exists, redirects to blob path if the file exists, otherwise return not found.

See #1369

See merge request !953
 2014-07-09 06:19:18 +00:00
Dmitriy Zaporozhets 593e262e40 Fix 500 on repo archive download 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-08 14:55:20 +03:00
Dmitriy Zaporozhets 7bd9a702e3 Merge pull request #7222 from jhund/fix-5936 
Don't remove trailing newline when editing a file in web UI editor
 2014-07-08 09:43:23 +03:00
Marin Jankovski 005752e4c6 Check if blob or tree and redirect to the correct one. 2014-07-07 15:46:57 +02:00
ahmyi 4d051e987f Archive with content-length header 2014-07-03 11:05:51 +08:00
ahmyi dce6cb2d84 Content-length defined in header response 
Enable Content-Length to be defined in header response
 2014-07-03 10:57:01 +08:00
Marin Jankovski 751d267f29 Create required issue param for new action. 2014-07-01 14:03:49 +02:00
Jo Hund df3c466e37 Don't remove trailing newline when editing a file in web UI editor: 
* populate ACE editor content via API instead of HTML element inner text (to preserve trailing whitespace).
* remove hack in EditTreeController#preview that replaces any removed \n.

Fixes #5936
 2014-06-27 10:50:36 -07:00
Dmitriy Zaporozhets 8fee5a0572 Make app works with strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 23:24:17 +03:00
Dmitriy Zaporozhets 2acde87e0d Project hook, milestone, snippet strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 18:51:11 +03:00
Dmitriy Zaporozhets e382c8dfc7 team member and hook strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 18:45:33 +03:00
Dmitriy Zaporozhets f86afb732b Fix dev env. Fix MR creation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 18:40:13 +03:00
Dmitriy Zaporozhets 16a0a4aecc Note strong_params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 16:49:22 +03:00
Dmitriy Zaporozhets 3a21c904dd Use strong params for 5 more models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 15:00:09 +03:00
Dmitriy Zaporozhets 04516027df Project services to strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 14:49:09 +03:00
Dmitriy Zaporozhets 1dab15940d Remove protected_atrributes gem and start moving to strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 14:30:07 +03:00
Dmitriy Zaporozhets e64343d6e1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/views/layouts/devise.html.haml
	features/project/project.feature
	features/steps/project/project.rb
 2014-06-26 13:02:08 +03:00
Dmitriy Zaporozhets 3900eee30e Increase commit log amount for tree view from 10 to 25 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 10:29:39 +03:00
Dmitriy Zaporozhets 907548a0fb dont render discussion diff unless note is for diff 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-25 10:14:35 +03:00
Dmitriy Zaporozhets 30912c75b8 Improve merge request comments 
When add diff note on 'Changes' page - and then go to 'Discussions' tab
you will not see this discussion unless you reload a page. This commit
fixes it by rendering discussion on 'Discussion' page as soon as you
submit comment on 'Changes' page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 14:57:59 +03:00
Dmitriy Zaporozhets 094e5efb4c Merge pull request #6992 from skv-headless/project_commits_sql_optimization 
notes count in 1 query  for mr and commits
 2014-06-24 10:38:50 +03:00
Dmitriy Zaporozhets d52df8e730 Merge branch 'issues-filter-by-description' into 'master' 
Issues filter by description

In Issues section of any project there is a filter box, which by default says 'Filter by title or description' - so this behaviour is desired. But in fact only filter by title works and filter by description DOESN'T work. This fix adds description fitlering.
 2014-06-24 07:04:01 +00:00
Dmitriy Zaporozhets 6149dba518 Remove NotesObserver 2014-06-17 22:09:01 +03:00
Dmitriy Zaporozhets b165b097f5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb
 2014-06-17 10:53:44 +03:00