Commit Graph
300 Commits
Author SHA1 Message Date
Jason Hollingsworth d9bb4230cc Adding authenticated public mode (internal).
Added visibility_level icons to project view (rather than just text).
Added public projects to search results.
Added ability to restrict visibility levels standard users can set.
2013-11-26 22:22:07 -06:00
Dmitriy Zaporozhets 58601ebdab Fix tests after user password length was changed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 20:07:55 +02:00
Carlos Paramio 4db87f7c4b Integration with Assembla 2013-11-21 13:18:02 +01:00
Dmitriy Zaporozhets 201d489780 Annotate
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 14:10:03 +02:00
Dmitriy Zaporozhets c5b667351a Show broadcast message to users
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 15:08:20 +02:00
Dmitriy Zaporozhets f1ecf53c1e Broadcast message model + migrations
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 13:47:28 +02:00
Dmitriy Zaporozhets 580dfe5af9 Replace assign with stub for default_branch
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-06 19:13:45 +02:00
Dmitriy Zaporozhets b813a4888a Remove User#namespaces method from code
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-05 17:15:43 +02:00
Dmitriy Zaporozhets f9b66aecdd Revert "More escaping"
This reverts commit c46eaca912.
2013-11-05 15:35:49 +02:00
Nigel Kukard c46eaca912 More escaping
- Database name may contain characters which are not shell friendly
- Database password could contain the same
- While we at it there is no harm in escaping generated paths too
- Refactored 2-line system(command)

Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
2013-11-04 22:09:03 +00:00
Angus MacArthur aefe2e952f Fixing unsafe use of Thread.current variable :current_user 2013-10-16 01:20:53 -04:00
Dmitriy Zaporozhets f4d68f398f set current_user for project spec 2013-10-15 11:29:22 +03:00
Marin Jankovski 97cf31c4cb Update user access level when adding to group. 2013-10-14 15:15:14 +02:00
Dmitriy Zaporozhets b883d94f96 Merge branch 'relative_links_in_documentation' of /home/git/repositories/gitlab/gitlabhq 2013-10-11 13:00:05 +00:00
Marin Jankovski f40e0171db Test if markdown is rendered properly. 2013-10-11 13:44:00 +02:00
Jacob Vosmaer 461abaa843 Add GollumWiki#empty? method 2013-10-09 17:17:52 +02:00
Dmitriy Zaporozhets db10e6aaa6 Fix merge request model spec 2013-10-07 19:42:59 +03:00
Dmitriy Zaporozhets 83c727c550 Merge pull request #5216 from bladealslayer/feature/flowdock_integration
Added Flowdock integration support via a service.
2013-10-04 08:00:51 -07:00
Dmitriy Zaporozhets e219cf7246 Annotate! 2013-10-01 15:15:28 +03:00
Boyan Tabakov d8562cc9a1 Added Flowdock integration support via a service.
Added test for the FlowdockService.
2013-09-29 20:31:08 +03:00
Dmitriy Zaporozhets 0a2a34a4d1 Ignore owner_id for Group in tests 2013-09-26 14:52:17 +03:00
Izaak Alpert 8a8123a3d4 Update for readability
fixed a test a broke in the configurable theme PR
Change-Id: Id894506941bc01ab0d259d48ca7ff9b80bb2c57e
2013-09-22 20:56:17 -04:00
Izaak Alpert 51e6095dd1 Make users theme configurable
GITLAB-1262

Change-Id: I690cb8ea294df53ebe8405a519c23c501af2c21a

Conflicts:
	app/models/user.rb
	config/initializers/1_settings.rb
	spec/models/user_spec.rb
2013-09-22 01:05:14 -04:00
Hiroyuki Sato a3ef683108 Drop support of root namespace in model 2013-09-17 23:05:42 +09:00
Dmitriy Zaporozhets e0e88cddd8 Fix tests 2013-09-14 22:01:31 +03:00
Hiroyuki Sato df9cbbc924 Drop support of root namespace in routing 2013-09-13 07:00:24 +09:00
Izaak Alpert 5dae40f579 Update to only provide one way to get a default user
-calling build_user will now apply defaults and only override them if as: :admin is set

Change-Id: Id1d938c0967752ecc14370af54f2d88128d18c44
2013-09-11 14:04:15 -04:00
Stephen Holdaway e19526c2ac Fix several_namespaces? to work with multiple ownership of groups 2013-09-12 00:10:45 +12:00
Izaak Alpert 7a56075efa Some of the requested updates, rebase on master
Change-Id: I305266fe9acbbb5136adeeb52e7e4e1d6629a30a
2013-09-09 12:04:38 -04:00
ash wilson c8a115c0e3 Link issues from comments and automatically close them
Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
references in descriptions, titles, or attached Notes creates a back-reference
Note that links to the original referencer. Furthermore, pushing commits with
commit messages that match a (configurable) regexp to a project's default
branch will close any issues mentioned by GFM in the matched closing phrase.
If accepting a merge request would close any Issues in this way, a banner is
appended to the merge request's main panel to indicate this.
2013-08-25 18:58:41 -04:00
Dmitriy Zaporozhets 668358439e Fix tests after can_create_team was removed 2013-08-21 15:07:09 +03:00
Dmitriy Zaporozhets 8dd37afe34 Reannotate 2013-08-21 12:34:02 +03:00
Dmitriy Zaporozhets 606701ada4 Look for milestone by iid in milestone controller 2013-08-21 12:22:18 +03:00
Dmitriy Zaporozhets e9f1c39e7e Fix tests 2013-08-20 21:41:14 +03:00
Dmitriy Zaporozhets a73e068c06 Fixing tests after adding iid for issues/mr 2013-08-20 16:56:05 +03:00
Dmitriy Zaporozhets 7825830ca5 Allow project name, path etc start with number. Fixed specs 2013-08-13 12:24:10 +03:00
Ronald van Eede 62ba789545 Added can_test? mehod to Service model and added tests 2013-08-09 22:02:34 +02: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
Johannes Schleifenbaum cd19f82e51 Fix typos 2013-07-29 12:47:06 +02:00
Izaak Alpert fae3f46615 Refactor merge api create
-Made the api method a little more readable
-removed some missed extra newline's

Change-Id: Ic38baafc813aaeda0a8b283f39916182c8ec37d5
2013-07-17 22:48:03 -04: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
Jacob Vosmaer aa0473d0eb Validate fingerprint uniqueness 2013-07-17 15:17:18 +02:00
Jacob Vosmaer 3ada8f45c7 Remove unnecessary user from test 2013-07-17 15:17:17 +02:00
Dmitriy Zaporozhets 21f7c99c25 group add_users spec 2013-06-26 15:32:09 +03:00
Dmitriy Zaporozhets 7b87fcbad4 Fix broken factory 2013-06-22 16:46:57 +03:00
Dmitriy Zaporozhets 0bc714c271 Remove form for adding user to several projects from admin area.
Remove unnecessary projects order on User#show
2013-06-22 13:41:08 +03:00
Dmitriy Zaporozhets 8c918e583a Remove tests for missing method 2013-06-21 21:50:34 +03:00
Dmitriy Zaporozhets 6e35aceff2 Annotated 2013-06-19 15:40:33 +03:00
Dmitriy Zaporozhets 1b3b90dbfd Remove teams specs 2013-06-18 22:06:20 +03:00
Dmitriy Zaporozhets 439f399bec Remove all team resources except models. Move models to deprecated directory 2013-06-18 21:22:34 +03:00