Commit Graph
181 Commits
Author SHA1 Message Date
Jeroen van Baarsen 5554eb166b Fixed some hound notices 2014-04-14 15:24:37 +02:00
Jeroen van Baarsen 802087c937 Changed default in the database for the statemachine 2014-04-14 15:22:57 +02:00
Job van der Voort 52cf11b9f2 add a space 2014-04-07 14:26:52 +00:00
Job van der Voort 6d19696267 Fix faulty namespaces 2014-04-07 16:03:49 +02:00
Dmitriy Zaporozhets 0d7986a8c7 Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	db/schema.rb
2014-03-14 12:00:21 +02:00
Dmitriy Zaporozhets 10c0cb8ca7 Add migration for already imported projects
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-13 11:28:41 +02:00
Dmitriy Zaporozhets e603da7360 Add Project#import_status field
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-12 17:14:28 +02:00
Dmitriy Zaporozhets 56318a24b1 Merge pull request #6474 from jvanbaarsen/post-tag-hook
Add web hooks on tag
2014-03-12 09:52:34 +02:00
Dmitriy Zaporozhets cf890b227a Add User#last_credential_check_at
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-11 10:07:22 +02:00
Jeroen van Baarsen 9a676ccc0a Added tag_push_events to the web_hooks
* Added a scope to the web_hooks model
* Added extra checkbooks in de hooks overview window
2014-03-05 20:44:01 +01:00
gussan 93bc67ab11 Add index_merge_request_diffs_on_merge_request_id 2014-03-04 10:38:09 +09:00
Binsztock RémyandOlivier Gonzalez e7382de108 Add Gemnasium Service for Gitlab
Conflicts:

	db/schema.rb
2014-02-21 16:25:22 +01:00
Jason Hollingsworth 29cfd33d94 Add email aliases for users
Emails are used to associate commits with users. The emails
are not verified and don't have to be valid email addresses. They
are assigned on a first come, first serve basis.

Notifications are sent when an email is added.
2014-02-13 22:59:39 -06:00
Dmitriy Zaporozhets e8f8abddb0 Squash migrations for years 2011 and 2012
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-04 17:11:30 +02:00
Dmitriy Zaporozhets a184fcf368 Merge pull request #6178 from Popl7/add_group_avatars
added group avatars
2014-01-28 00:26:18 -08:00
Steven Thonus 251df827a5 added group avatars 2014-01-28 08:38:00 +01:00
skv-headless 4125de5ef1 Fix merge_request_diffs migrations for postgresql 2014-01-27 18:50:53 +04:00
Dmitriy Zaporozhets 28e13634dc Merge branch 'improve/mr_diff'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/project_fork.rb
	features/steps/project/project_forked_merge_requests.rb
	features/steps/project/project_issue_tracker.rb
	features/steps/project/project_markdown_render.rb
	features/steps/shared/project.rb
2014-01-23 14:38:23 +02:00
Dmitriy Zaporozhets 4d56c359d3 Merge pull request #6075 from skv-headless/remove_deprecated_finders
Remove deprecated finders
2014-01-22 11:04:56 -08:00
Dmitriy Zaporozhets de724a7a34 Improve db schema for merge request diffs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-22 15:17:41 +02:00
Dmitriy Zaporozhets c983e8eb3d Create separate table to store Merge request commits/diffs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-22 14:22:47 +02:00
skv a3f645ef51 Remove deprecated finders 2014-01-19 23:39:56 +04:00
Jerome Dalbert 2e3f250d45 Add website url to user 2014-01-18 19:15:10 +00:00
Andrew Tomaka 0760ba3efb Customization and previewing of broadcast messages 2013-12-18 17:43:45 -05:00
Dmitriy Zaporozhets 86a8796b13 Create EmailsOnPushService model
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-17 12:42:40 +02:00
Steven Thonus 37383966ef Archiving old projects; archived projects aren't shown on dashboard
features for archive projects
abilities for archived project
other abilities for archive projects

only limit commits and merges for archived projects

ability changed to prohibited actions on archived projects

added spec and feature tests for archive projects

changed search bar not to include archived projects
2013-12-16 14:39:14 +01:00
Drew Blessing d9b5777db1 Allow user to hide the message to add an ssh key permanently
Favor links instead of buttons

Remove unnecessary class

Remove extra space
2013-12-14 20:21:12 -06:00
Dmitriy Zaporozhets 169b4ce0ca Add new fields to web_hooks table.
Next fields were added:
* push_events
* issues_events
* merge_requests_events

Main goal is to create web hooks that can be triggered only for certain
event types. For example you can have separate web hook for push events
and another one for issues.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-04 13:37:17 +02:00
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 f1ecf53c1e Broadcast message model + migrations
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 13:47:28 +02:00
Dmitriy Zaporozhets 9d14c5137a Project#default_branch use repo HEAD instead of DB value now
Drop default_branch field from projects table
Use repository.root_ref as value for defautl_branch method
Fixes issue with default_branch and HEAD getting out of sync

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-06 18:45:39 +02:00
Dmitriy Zaporozhets 6fff92e984 Enable confirmable and reconfirmable modules for User
Now when you want to signup or change existing email you will be forced
to confirm that you really own this email. You get email with link to
follow in order to confirm your email address

Conflicts:
	app/models/user.rb
2013-10-15 09:56:04 +03:00
Steven Thonus 65cad57a35 avatar upload on profile page 2013-10-09 09:05:09 +02:00
Dmitriy Zaporozhets edd2143d35 Namespaces.owner_id can be null 2013-09-26 14:48:58 +03:00
Dmitriy Zaporozhets 76a0739454 Add description to MergeRequest model 2013-09-09 16:32:43 +03: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
dsekretovandDmitriy Zaporozhets b1358639c8 Update 20130419190306_allow_merges_for_forks.rb
Postgress db migrate fails.(5.4=>6.0)
2013-08-25 21:47:04 +03:00
Dmitriy Zaporozhets 625fb2f29d Add iids to milestones. Moved iids logic to separate concern 2013-08-21 12:16:26 +03:00
Dmitriy Zaporozhets 3b0d7a3071 Drop deprecated tables 2013-08-21 12:08:10 +03:00
Dmitriy Zaporozhets 125c07fa0a Add iid field to issues and MR 2013-08-19 22:10:21 +03:00
Dmitriy Zaporozhets 7ecebdd02d Repository import during project creation often return timeout for medium and large repos.
So lets do it async. First create project, then import repo and create
satellite with Sidekiq
2013-08-12 18:21:47 +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 e06352979d st_diff field for Note 2013-08-04 19:00:41 +03:00
Dmitriy Zaporozhets d19d094b93 Remove ugly button and truncate too long project names. Remove unecessary newlines 2013-07-30 14:12:24 +03:00
Izaak Alpert d99594273d Style changes from review with @randx
-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow

Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
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
Dmitriy Zaporozhets 5181816970 Merge branch 'master' into 6-0-dev 2013-07-12 14:42:35 +03:00
Dmitriy Zaporozhets 2a7ae176c1 Merge pull request #4282 from bke-drewb/3904
Increase snippet content column size.
2013-07-11 09:50:21 -07:00
Dmitriy Zaporozhets 113d2ff525 store and display public key fingerprint 2013-06-24 20:07:21 +03:00
Dmitriy Zaporozhets 9787c37aed More db index 2013-06-22 15:01:08 +03:00