Commit graph

179 commits

Author SHA1 Message Date
Nihad Abbasov
4aca61e8a6 install grape and mount Gitlab::API 2012-06-28 03:42:58 -07:00
randx
335f9d6410 New Feature: Diff patch file export for commit 2012-06-28 12:51:50 +03:00
Dmitriy Zaporozhets
a243253b10 Refactored project archive. Improved MR usability form 2012-06-13 09:03:53 +03:00
randx
edd81a79c5 Dashboard refactoring:
* dashboard should be in dashboard controller not project index
* projects index removed
2012-06-12 23:13:42 +03:00
randx
093159a868 Styled snippets. Raw button for snippet 2012-06-12 21:41:46 +03:00
Dmitriy Zaporozhets
1e4d15b406 Password & token split up, icon to button for top panel 2012-05-19 12:25:56 +03:00
Dmitriy Zaporozhets
9cd8f7b082 New Feature: Git Blame for file 2012-05-17 19:11:45 +03:00
Dmitriy Zaporozhets
28cb43135c Hooks UI improved, Request tests added 2012-04-26 20:43:12 +03:00
Dmitriy Zaporozhets
08994f3f60 Merge remote-tracking branch 'origin/merge_button'
Conflicts:
	app/assets/javascripts/merge_requests.js
	db/schema.rb
2012-04-21 12:22:56 +03:00
randx
35e21b3402 Admin dashboard 2012-04-20 19:41:49 +03:00
Dmitriy Zaporozhets
c9def945d4 User blocking improved. Admin area styled 2012-04-16 23:33:03 +03:00
Valery Sizov
8269a3a735 Auto-merge: checking via AJAX 2012-04-16 22:08:03 +03:00
Dmitriy Zaporozhets
95fde9bd7a Projects page as dashboard. Old dashboard removed 2012-04-14 11:20:45 +03:00
Dmitriy Zaporozhets
23d950855d Milestone basic scaffold 2012-04-09 00:28:58 +03:00
randx
78d620b3b6 Raw gitlab automerge feature 2012-03-29 18:03:05 +03:00
randx
69ef81404c UI improved, .main_box css class for show pages 2012-03-28 10:46:51 +03:00
Dmitriy Zaporozhets
724ea16c34 Activities page added. Dashboard few specs. Preparing for 2.3 2012-03-19 22:52:16 +02:00
Dmitriy Zaporozhets
5d2bd5ec3a Simple search implementation 2012-03-16 01:14:39 +02:00
Dmitriy Zaporozhets
3676838dc9 Rspec test repo replaced.\nMerge Requests improved 2012-03-13 23:54:49 +02:00
Dmitriy Zaporozhets
376bec26de Added dashboard page. Projects page not root from now 2012-02-28 22:59:36 +02:00
Dmitriy Zaporozhets
215a01f63c move notes login to one controller 2012-02-24 09:16:06 +02:00
vsizov
bdc42488e9 wiki is done 2012-02-20 20:16:55 +03:00
Valery Sizov
85974948e7 Wiki: history 2012-02-19 21:52:05 +02:00
Valery Sizov
4c1b8558df Wiki: base implemetation logic 2012-02-19 19:50:13 +02:00
Valery Sizov
eacea15a21 wiki base sceleton 2012-02-19 19:50:13 +02:00
Dmitriy Zaporozhets
dac7c44ab3 Updated readme, Roles in progress 2012-02-15 23:51:04 +02:00
Dmitriy Zaporozhets
37224dc9c1 ProtectedBranches model, Master permission for repo\n Allow push to protected branch for masters only 2012-02-15 22:02:33 +02:00
Dmitriy Zaporozhets
8d493019c4 Show commits for merge request immediatly 2012-02-15 01:15:02 +02:00
Dmitriy Zaporozhets
cc043f32d8 Admin area improved 2012-02-11 19:56:18 +02:00
Dmitriy Zaporozhets
4d89322d67 Snippets - fixed after bootstrap
Project - restyled show page, removed info page
Repository - restyled show page, added download option
Tags - added download options
2012-02-08 01:00:49 +02:00
Dmitriy Zaporozhets
422e43989b Compare view for commits 2012-02-06 22:32:04 +02:00
Dmitriy Zaporozhets
8ebfae9a07 Merge branch 'bootstrap'
Conflicts:
	Gemfile
	app/views/commits/_commits.html.haml
	app/views/projects/empty.html.haml
2012-01-30 00:45:35 +02:00
Dmitriy Zaporozhets
0a4222fb98 Bootstrap: Activities 2012-01-28 16:47:55 +02:00
vsizov
d6a0b8f428 LDAP done 2012-01-28 16:23:17 +03:00
Valery Sizov
c083df0570 LDAP BASE IMPLEMENRTATION 2012-01-28 13:11:21 +03:00
Dmitriy Zaporozhets
7157305d5e cleaning dashboard & tags 2012-01-23 09:54:47 +02:00
Dmitriy Zaporozhets
fa8c0c7813 Admin area: add multiple users to project 2012-01-21 18:06:14 +02:00
Dmitriy Zaporozhets
15c4655527 UI: add new button, top panel restyle etc 2012-01-18 22:15:45 +02:00
Dmitriy Zaporozhets
cbd78922ee Merge branch 'deploy_keys'
Conflicts:
	app/views/layouts/project.html.haml
	db/schema.rb
2012-01-14 21:26:35 +02:00
Dmitriy Zaporozhets
57ac5fe99f Procfile added. use foreman start to run gitlabhq 2012-01-08 12:20:24 +02:00
Dmitriy Zaporozhets
2d3b6375f3 hooks scaffold 2012-01-04 02:07:56 +02:00
Dmitriy Zaporozhets
2dae0e18e0 web hooks scaffold started 2012-01-04 00:42:14 +02:00
Dmitriy Zaporozhets
a667c71312 repo branches and tags 2011-12-31 13:12:10 +02:00
Dmitriy Zaporozhets
0ae9ac155c repo tab added. activities page for repo 2011-12-30 22:56:13 +02:00
Dmitriy Zaporozhets
0f627a65f4 Project tab r1 is finished 2011-12-30 08:54:42 +02:00
miks
f8ad4d2b42 Merge branch 'master' into deploy_keys
Conflicts:
	app/models/project.rb
2011-12-29 21:46:21 +02:00
miks
723104c45f Initial deploy_key feature commit 2011-12-29 21:44:16 +02:00
Dmitriy Zaporozhets
c1c903fb95 Project tab added. activities, team, snippets moved to project tab 2011-12-28 09:38:50 +02:00
Valery Sizov
66fb3909a5 Merge branch 'web_hooks' of https://github.com/ariejan/gitlabhq into ariejan-web_hooks
Conflicts:
	app/models/project.rb
	config/routes.rb
	db/schema.rb
2011-12-27 23:21:26 +02:00
Dmitriy Zaporozhets
9a2a861276 Design tab for profile. Colorscheme as db value 2011-12-20 22:47:09 +02:00
Ariejan de Vroom
1c9b9b7a3b Added Resque as a dependency 2011-12-12 23:03:38 +01:00
Jeremy Mack
926f3013c2 Updated validations and routes to support dots in project names 2011-12-12 13:13:11 -05:00
Dmitriy Zaporozhets
cd779e56e1 dashboard v1 2011-12-08 22:17:53 +02:00
Ariejan de Vroom
e4b1f38c27 Added merge request dashboard, showing all merge requests assigned to
you across projects.
2011-12-08 01:07:02 +01:00
Ariejan de Vroom
f512418b27 Added "Issues" dashboard
This shows issues assigned to you, across all your projects, in one
place.

References #173
2011-12-08 00:31:06 +01:00
Dmitriy Zaporozhets
bdc658095c refcatoring. cleaning after gitosis 2011-12-05 09:43:53 +02:00
Dmitriy Zaporozhets
8803fbb593 merge request: notes, diffs, commits 2011-11-28 22:16:57 +02:00
Dmitriy Zaporozhets
6d460aa2d6 merge request entity 2011-11-28 09:39:43 +02:00
gitlabhq
79bcdfb8d7 fix for branch names with '/' 2011-11-16 12:30:17 -05:00
gitlabhq
bb35ef2f60 fix branch/tag select 2011-11-16 12:19:18 -05:00
gitlabhq
af08ed6b66 refactoring 2011-11-16 08:38:53 +03:00
Nihad Abbasov
ed5e19a518 allow user to reset his private token 2011-11-15 17:08:20 +04:00
Nihad Abbasov
d63f04ab16 nest issues actions in one route collection 2011-11-15 12:55:57 +04:00
Nihad Abbasov
368deb5992 clean up whitespace from project 2011-11-15 12:34:30 +04:00
Valery Sizov
6b66a766d1 Graph: build json 2011-11-13 00:30:51 +02:00
Aleksei Kvitinskii
6e08b5cc85 create tags page and made tag filter for projects 2011-11-05 21:00:05 +02:00
Aleksei Kvitinskii
1e5aa0efff add tags autocomplete 2011-11-05 14:57:40 +02:00
gitlabhq
5c9cb850fc dashboard is now root path 2011-11-03 07:00:16 -04:00
gitlabhq
485c5199b7 user dashboard 2011-10-31 22:57:16 +02:00
Nihad Abbasov
f1e6d9be90 Merge branch 'assets-refactoring' into dev
Conflicts:
	app/controllers/issues_controller.rb
	app/views/issues/index.html.haml
2011-10-26 23:35:17 +05:00
Nihad Abbasov
d62200cad4 clean-up code
* Remove trailing whitespace
  * Converts hard-tabs into two-space soft-tabs
  * Remove consecutive blank lines
2011-10-26 18:46:25 +05:00
Adam Leonard
5b284f6adf Add ability to Search issues 2011-10-22 00:06:38 -04:00
Aleksei Kvitinskii
59704f481e extended user profile with social fields 2011-10-20 01:34:05 +03:00
gitlabhq
9265de3d25 snippets are ready 2011-10-17 00:07:10 +03:00
gitlabhq
99777cab2a Merge branch 'issue_im'
Conflicts:
	config/initializers/rails_footnotes.rb
2011-10-15 20:54:39 +03:00
VSizov
dd833d28ad Sortable issues 2011-10-15 19:56:53 +03:00
gitlabhq
57baa49bc3 project path & code regexp validation 2011-10-15 19:30:56 +03:00
gitlabhq
ec9e54ea94 gitosis error handle 2011-10-10 00:15:28 +03:00
gitlabhq
9ba1224867 init commit 2011-10-09 00:36:38 +03:00