home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,161 Commits 48 Branches 340 Tags
4e8cc3e19f7c13435c360e7ccaaa9cc860cbff34
Commit Graph
84 Commits
Author SHA1 Message Date
Valery Sizov 91402ac0eb Merge branch '7-4-stable' into ee_stable 2014-10-21 13:48:16 +03:00
Ciro SantilliandDmitriy Zaporozhets db5ea013f4 Use :message key, not :error for File::Service. 2014-10-21 11:37:15 +03:00
Dmitriy Zaporozhets f4d43ed3b1 Merge branch 'master' into ce-upstream 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/user.rb
	app/views/admin/users/index.html.haml
	app/views/projects/services/_form.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-10-14 18:23:51 +03:00
Vinnie Okada 31bc42de57 Add Spinach tests for task lists 2014-10-06 02:07:03 -05:00
Dmitriy Zaporozhets eafac5932f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/helpers/merge_requests_helper.rb
	doc/update/README.md
	lib/gitlab/reference_extractor.rb
 2014-10-03 16:18:40 +03:00
Ciro Santilli 3960a5a25a Remove assignment without effect. 2014-10-03 12:19:31 +02:00
Dmitriy Zaporozhets a5972170ad Merge remote-tracking branch 'origin/master' into ee-7-4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/team_members_controller.rb
	app/finders/projects_finder.rb
	app/models/group.rb
	app/models/project_team.rb
	app/models/users_group.rb
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/ldap.md
	features/steps/group.rb
	features/steps/project/project.rb
 2014-10-02 13:24:59 +03:00
Ciro Santilli 89f7345f3f Remove unnecessary page. from tests. 2014-09-26 09:51:17 +02:00
Ciro Santilli ef6e94e37e Replace old spinach step definitions with step. 2014-09-22 10:01:50 +02:00
Jacob Vosmaer e93523ed31 Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre 
Conflicts:
	Gemfile
	README.md
	VERSION
	db/schema.rb
	doc/install/installation.md
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/user.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-09-15 11:24:51 +02:00
Ciro Santilli 81336bd2b5 Add permalink to fixed SHA URL on blob view. 2014-09-01 10:26:47 +02:00
Jacob Vosmaer 90ce0be420 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups 
Conflicts:
	app/models/group.rb
	app/views/groups/members.html.haml
	db/schema.rb
 2014-08-29 14:43:20 +02:00
Jan-Willem van der Meer 469bc36896 Add integration test for new LDAP sync 2014-08-15 10:32:30 +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
Robert Schilling b9519c8314 Validate label titel in project scope 2014-08-13 15:48:26 +02:00
Jan-Willem van der Meer 2be5aab425 Use singular route 
Even simpler
 2014-08-08 15:24:14 +02:00
Jan-Willem van der Meer a955975cbb Initial steps in feature 2014-08-08 14:25:50 +02:00
Dmitriy Zaporozhets c2c7d14ec5 Move all test repos data to ReposHelpers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 17:23:40 +03:00
Dmitriy Zaporozhets bb2f4d665e Fix browse code spinach tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 16:20:47 +03:00
Dmitriy Zaporozhets 0f4748873d Project labels tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 14:06:14 +03:00
Dmitriy Zaporozhets d3ea53877d Tests for trending/starred pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-26 10:33:42 +03:00
Dmitriy Zaporozhets e21ca9f8b1 Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosantilli-star 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-07-24 10:54:42 +03:00
Dmitriy Zaporozhets f0bfeb6e33 Refactor explore area tests. Replaced old links 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-23 12:18:51 +03:00
Ciro Santilli 714f7201d3 Add project stars. 2014-07-17 22:47:16 +02:00
dreis 1da2262efd Added public groups area to enhance searching and exploring of projects 
fixed whitespaces and quotes

fixed whitespaces

fixed devise.html.haml

fixed method parenthesis in app/models/group.rb

removed links from header

removed links from devise.html

added tests
 2014-07-15 08:19:27 +02: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
Dmitriy Zaporozhets d593c98fcb Delete wall notes tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 14:29:26 +03:00
Dmitriy Zaporozhets 11728851bf Fix blob highlight tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 21:36:38 +03:00
Dmitriy Zaporozhets 5a1429ae21 Fix branches tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-24 14:20:12 +03:00
Dmitriy Zaporozhets a7680d7e3a Spinach feature for appearance 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-14 22:14:51 +03:00
Ciro Santillli 439a61783d User can leave group from group page. 2014-02-12 15:52:53 +01:00
Ciro Santillli 91571c078d User pages are visible to users without login 
... if the user is authorized to at least one public project.
 2014-02-11 15:45:30 +01:00
skv a3f645ef51 Remove deprecated finders 2014-01-19 23:39:56 +04:00
Dmitriy Zaporozhets 963a31144b Active tab tests for admin broadcast messages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 14:32:17 +02:00
Dmitriy Zaporozhets e50c0d5cb7 Fix spinach profile tests 2013-10-09 17:01:04 +03:00
Dmitriy Zaporozhets 0d715bcd81 Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork 
Conflicts:
	app/views/projects/commit/show.html.haml
	app/views/projects/compare/show.html.haml
	app/views/projects/merge_requests/branch_from.js.haml
 2013-07-30 13:35:33 +03:00
Dmitriy Zaporozhets 4de1db1168 Public area spinach tests 2013-07-29 17:07:03 +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 c4301ce049 update tests with new routing 2013-07-16 23:14:22 +03:00
Dmitriy Zaporozhets d207a31fc9 Fix tests and tab highlight 2013-07-16 22:25:59 +03:00
Dmitriy Zaporozhets dc038a7108 Rename Group#people to Group#members 2013-07-12 19:01:39 +03:00
Dmitriy Zaporozhets 3e09e6f7b8 Move Profile related controllers under Profiles:: module 2013-06-24 18:24:14 +03:00
Dmitriy Zaporozhets 038d40f0f5 Solve inconsistency between network graph & stat graphs 2013-06-11 09:54:01 +03: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 132575faa0 Fix routiong specs after rename of resque controller 2013-05-30 11:44:35 +03:00
Dmitriy Zaporozhets b7f1cf9f49 Feature tests for deploy keys 2013-05-06 15:09:41 +03:00
Stephen LottermoserandStephen Lottermoser 4c44c5ef9a Internally public projects 
Public projects listed in the public section will be linked to the
actual project's page. Public projects now give any user Guest
permissions to the project, allowing them to download the code, read
and create issues, and view anything else in the project's pages.

Ample access tests have been added to the project_access_spec to
verify correct permissions and behavior on public projects.
- Visitors to the site who are not logged in still cannot view the
  project's pages.
- Logged-in users visiting a public project where they are not a team
  member can create issues, but not snippets. They can view the projects
  code, issues, merge requests, etc, just as if they were a Guest member
  of the project.
- Since this is a public project, the user is also granted :download_code
  permissions, a permission normally reserved for Reporters, since they
  can clone the repo anyways and browse commits and branches locally.
 2013-05-02 00:06:59 -07:00
Dmitriy Zaporozhets 413a310faa fixed blame and mr factory 2013-04-03 10:06:31 +03:00
Andrew8xx8 8f08fbfd9f Tests for personal snippets added 2013-03-25 02:19:40 +04:00
Andrew8xx8 5b35000f16 Snippets feature refactored. Tests now use spinach 2013-03-24 22:31:14 +04:00