home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-14 07:06:17 +10:00
Code Issues Packages Projects Releases Wiki Activity
5,504 Commits 48 Branches 340 Tags
ad0f1276dbfffadb18fa28980fb4bca91dbc19b9
Commit Graph
202 Commits
Author SHA1 Message Date
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 8bc0a06cd4 Add more fields to project service model 2013-05-22 17:21:05 +03:00
Dmitriy Zaporozhets af5d0e9e92 Merge pull request #3275 from Undev/feature/code_cleanup_remove_old_hashes 
Code cleanup: Replace old hashes and remove trailing spaces
 2013-05-07 06:59:03 -07:00
Dmitriy Zaporozhets 749d3383cc Add migration code for existing deploy keys 2013-05-06 17:42:13 +03:00
Dmitriy Zaporozhets 8e4625af61 Remove project_id from keys table 2013-05-06 15:10:05 +03:00
Dmitriy Zaporozhets a735ce2aa7 migrations for ssh key STI and deploy keys <-> projects relation 2013-05-06 12:27:54 +03:00
Andrey Kumanyaev 67ccc8b52a Replace old hashes with new 1.9 ruby hashes (rebase) 2013-05-05 18:01:10 +04:00
Dmitriy Zaporozhets f40d4e6685 Merge pull request #3597 from amacarthur/fork-pull-request 
updated fork feature to use gitlab-shell for v5 of gitlab
 2013-05-02 23:41:07 -07:00
Angus MacArthur ec63804831 Made fixes suggested by @randx in pull request 
See https://github.com/gitlabhq/gitlabhq/pull/3597#discussion-diff-4014638
 2013-05-02 16:41:33 -04:00
Angus MacArthur ae33fdf297 updated fork feature to use gitlab-shell for v5 of gitlab 2013-04-15 01:54:52 -04:00
Izaak Alpert f210a5d832 Updated setup to reference the gitlab-shell var 
-Well really it uses what everything else uses -- would be nice to have this as a specific config var

Change-Id: I08cef6080950bf40360b461abd2535ea8890410d
 2013-04-12 15:19:18 -04:00
Dmitriy Zaporozhets 0ae892007d Remove Wiki and db table since we use gollum now 2013-04-10 22:20:00 +03:00
Dmitriy Zaporozhets 4496a747c6 Improve migration AddLastActivityColumnIntoProject to use real last activity date if present 2013-04-09 20:58:47 +03:00
Dmitriy Zaporozhets ae2233b114 Improve perfomance by using project.last_activity_at in project_last_activity helper 2013-04-09 20:53:27 +03:00
Dmitriy Zaporozhets 0f2798d498 Merge branch 'feature/refactoring_scopes_pr' of https://github.com/Undev/gitlabhq into Undev-feature/refactoring_scopes_pr 
Conflicts:
	db/schema.rb
 2013-04-09 20:37:04 +03:00
Dmitriy Zaporozhets 362d82d10e Prevent same branch in MR seeds 2013-04-05 16:19:05 +03:00
Dmitriy Zaporozhets b65903e005 Improve development fixtures 2013-04-05 15:42:07 +03:00
Dmitriy Zaporozhets 25856a47e5 save each notification setting with ajax on change 2013-04-04 22:11:51 +03:00
Dmitriy Zaporozhets 3c3baf8f6d add notification level to UsersProject 2013-04-04 22:11:15 +03:00
Andrey Kumanyaev 734d6fcdf0 Perfomance updating Project activity sort 2013-04-03 06:21:04 +04:00
Dmitriy Zaporozhets 4b3950456d notification level for user 2013-03-26 10:48:07 +02:00
Andrew8xx8 b3dc4fb721 Migrations to convert data added 2013-03-25 00:39:38 +04:00
Andrew8xx8 5b35000f16 Snippets feature refactored. Tests now use spinach 2013-03-24 22:31:14 +04:00
Andrew8xx8 bc7c5f87bb Project snippet moved to separate model 2013-03-24 19:26:49 +04:00
Andrew8xx8 cc869d5dc1 Private field added to snippet 2013-03-23 22:14:37 +04:00
Dmitriy Zaporozhets b765a7958d Move snippets to own tab as feature. Make it disabled for new projects by default 2013-03-18 23:33:41 +02:00
Dmitriy Zaporozhets 8cad1c9f4c add dark solarized theme for code preview 2013-03-15 15:09:34 +02:00
Andrew8xx8 c6d6bd6ab4 Typo fixed 2013-03-05 14:29:44 +04:00
Andrew8xx8 0d9a6fe7b1 User's blocked field refactored to use state machine 2013-03-04 18:52:30 +04:00
Andrew8xx8 9a06dd4aa1 Migrations added 2013-03-04 18:51:00 +04:00
Dmitriy Zaporozhets 87f555e1ef fixed db/schema 2013-03-01 16:07:55 +02:00
Dmitriy Zaporozhets 5c3cb47c16 Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq into Undev-team-and-group-descriptions 
Conflicts:
	db/schema.rb
 2013-03-01 16:05:51 +02:00
Dmitriy Zaporozhets e1f77b9be0 Merge branch 'link-to-issue-tracker' of https://github.com/Undev/gitlabhq into Undev-link-to-issue-tracker 
Conflicts:
	Gemfile.lock
 2013-02-28 17:02:20 +02:00
Andrew8xx8 2f1f05d431 Fixed notes from randx 2013-02-28 18:55:35 +04:00
Andrew8xx8 5f657203a1 Description added to temas 2013-02-28 17:15:22 +04:00
Andrew8xx8 9f45e01e84 Description to groups added 2013-02-28 17:14:21 +04:00
Andrew8xx8 1dab19d0d7 DB schema updated 2013-02-28 16:30:47 +04:00
Andrew8xx8 f13600845d Migration added 2013-02-28 16:11:13 +04:00
Andrew8xx8 e6d2e56961 Issue tracker field added to projects 2013-02-28 16:10:00 +04:00
Andrew8xx8 4a55c69877 Data converting migrations was wrong. Fixed 2013-02-27 12:53:36 +04:00
Dmitriy Zaporozhets d7b667fee2 Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into Undev-state-machine-stage-2 
Conflicts:
	app/models/merge_request.rb
 2013-02-26 10:38:40 +02:00
Dmitriy Zaporozhets c3659ef2e5 Fix merge request migration for postgres 2013-02-25 08:53:49 +02:00
Andrew8xx8 1b7b17d12a Database schema updated 2013-02-20 17:49:40 +04:00
Andrew8xx8 8ba27b7b46 Migrations for convertion merge_status added 2013-02-20 17:49:33 +04:00
Sijmen Mulder 3a45e6010f Update seeds for state columns 2013-02-19 22:14:28 +01:00
Jaakko Kantojärvi fab586bc87 Fix development fixture for gitlab_shell 2013-02-19 11:17:59 +02:00
Andrew8xx8 d58eb62d68 Migrations iproved 2013-02-19 11:32:10 +04:00
Andrew8xx8 e5f048f44d Migrations refactored ro support data convertion 2013-02-18 18:54:30 +04:00
Andrew8xx8 0b4f4fe157 Migrations for StateMachine refactoring added 2013-02-18 14:43:50 +04:00
Andrew8xx8 8db3920c01 State renamed to merge_status 2013-02-18 14:43:49 +04:00