Commit graph

273 commits

Author SHA1 Message Date
Dmitriy Zaporozhets 422e43989b Compare view for commits 2012-02-06 22:32:04 +02:00
Dmitriy Zaporozhets b51252e6ca Bootstrap: test fixes 2012-01-30 00:43:14 +02:00
Dmitriy Zaporozhets fca1ffb888 Bootstrap: Issues, Merge Requests, SSH Key completed 2012-01-29 23:59:12 +02:00
Dmitriy Zaporozhets 7f6e41fa02 Bootstrap: application layout 2012-01-28 00:51:02 +02:00
Dmitriy Zaporozhets b4cc04d7e1 Commit diff fixes, per-line comments fixed 2012-01-25 21:10:09 +02:00
Dmitriy Zaporozhets f4e3ec29c4 fixed commit commenting 2012-01-21 14:54:32 +02:00
Dmitriy Zaporozhets 744814c509 fixed team member spec 2012-01-19 22:23:23 +02:00
Dmitriy Zaporozhets 00d7bfda95 projects link added. security specs added 2012-01-19 09:27:23 +02:00
Dmitriy Zaporozhets c9ea5f1316 deploy key creation restyled 2012-01-18 00:46:13 +02:00
Dmitriy Zaporozhets 809413d9e7 minimalistic UI: issues index, css refactoring 2012-01-18 00:04:27 +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 09b877ef29 remove modal window from team member managment 2012-01-14 19:54:41 +02:00
Dmitriy Zaporozhets 621491c677 fixed test 2012-01-13 23:28:58 +02:00
Dmitriy Zaporozhets c8b955a44b lil restyle 2012-01-11 16:37:34 +02:00
Dmitriy Zaporozhets 70efc014e9 Merge branch 'project_activities' 2012-01-05 20:16:41 +02:00
Dmitriy Zaporozhets 97ba731574 Project activities restyled 2012-01-04 22:19:41 +02:00
Valery Sizov 212f400d67 fix bug #322 2012-01-03 23:39:03 +02:00
miks df583bf12d Specs for deploy_keys updated 2011-12-31 19:37:51 +02:00
Dmitriy Zaporozhets a667c71312 repo branches and tags 2011-12-31 13:12:10 +02:00
Dmitriy Zaporozhets d8247012b5 repositories tab specs 2011-12-31 12:52:01 +02:00
miks c973fce606 Use correct model for testing 2011-12-30 15:19:23 +02:00
miks 46d212832f Spec updates 2011-12-30 15:14:14 +02:00
Dmitriy Zaporozhets 0f627a65f4 Project tab r1 is finished 2011-12-30 08:54:42 +02:00
miks 65601ade2b Specs for deploy_keys 2011-12-30 00:33:26 +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 91275f6d86 commented dashboard spec 2011-12-28 09:08:50 +02:00
Dmitriy Zaporozhets 5b0d6ac873 dashboard test fix 2011-12-28 09:07:40 +02:00
Valeriy Sizov 5d6e79f4b9 Merge pull request #237 from CedricGatay/feature/expand_issues_ref_in_commit
Autolinks to issues in commit message (see #155)
2011-12-27 14:49:38 -08:00
Valery Sizov 676fa16ceb commented some tests 2011-12-27 23:49:16 +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
Cedric Gatay 89a03a3453 1/ rspec'ed
2/ @commit.safe_message as an argument
3/ preserve in helper
4/ spaces around operators
2011-12-27 00:37:27 +01:00
Ariejan de Vroom be6e52c2f6 Fixed typo in spec mster => master 2011-12-26 10:10:21 +01:00
Dmitriy Zaporozhets fbf412eaa0 fix dashboard spec 2011-12-25 20:06:18 +02:00
Dmitriy Zaporozhets 89a43543e9 fixed broken test bor truncated title 2011-12-22 21:52:57 +02:00
Dmitriy Zaporozhets a2d3b21189 User profile restyle. Feed(Atom) links for commits & issues 2011-12-19 23:32:59 +02:00
Valery Sizov 839aa7357a fix notification tests 2011-12-18 18:55:32 +02:00
Valery Sizov a66d9b4c76 annotate model 2011-12-18 16:09:16 +02:00
Dmitriy Zaporozhets aafb97634a fix failing test with long name 2011-12-16 00:00:28 +02:00
Dmitriy Zaporozhets 7a9fc48080 just test fix commit 2011-12-15 23:21:29 +02:00
Ariejan de Vroom 7ffb8fc616 Added specs for special cases
We don't execute web hooks when:
 * You create a new branch. Make sure you first create the branch, and then push any commits. This is the way Github works, so its expected behavior.
 * When tags are pushed.
2011-12-15 10:33:20 +01:00
Ariejan de Vroom edab46e9fa Added web hooks functionality
This commit includes:

 * Projects can have zero or more WebHooks.
 * The PostReceive job will ask a project to execute any web hooks defined for that project.
 * WebHook has a URL, we post Github-compatible JSON to that URL.
 * Failure to execute a WebHook will be silently ignored.
2011-12-14 17:38:52 +01:00
Dmitriy Zaporozhets ff1cbbc532 Issue restyle 2011-12-14 08:58:35 +02:00
Dmitriy Zaporozhets 6f32ccf432 merge_requests restyle with forms 2011-12-13 23:56:04 +02:00
Dmitriy Zaporozhets cd779e56e1 dashboard v1 2011-12-08 22:17:53 +02:00
Dmitriy Zaporozhets 8e0126e9ec Merge branch 'issue_dashboard' into improved_dashboard 2011-12-08 15:05:01 +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
Dmitriy Zaporozhets 2677bc3acb network graph header, fixed test 2011-12-08 01:45:36 +02:00
Ariejan de Vroom 0783e4cf98 Check that issues from different projects get into the atom feed 2011-12-08 00:37:56 +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 1b8f082061 new access rights implemented 2011-12-07 10:04:57 +02:00
Dmitriy Zaporozhets 68154e8fe9 spec fix 2011-12-07 09:48:44 +02:00
Dmitriy Zaporozhets bdc658095c refcatoring. cleaning after gitosis 2011-12-05 09:43:53 +02:00
Dmitriy Zaporozhets 1ce55d161a new team memeber selectbox replaced 2011-11-30 23:41:00 +02:00
Dmitriy Zaporozhets 837685d56b merge request model specs 2011-11-28 23:24:08 +02:00
Dmitriy Zaporozhets c0e5bc5ee8 tests for merge request creation 2011-11-28 20:50:25 +02:00
Dmitriy Zaporozhets 60c6649a9a tests for merge request index/show 2011-11-28 20:42:32 +02:00
Dmitriy Zaporozhets 6d460aa2d6 merge request entity 2011-11-28 09:39:43 +02:00
Dmitriy Zaporozhets 2244203968 remove save_adn_open_page from specs 2011-11-27 17:39:58 +02:00
Dmitriy Zaporozhets a031813887 Commit, network graph refactoring 2011-11-27 17:35:49 +02:00
Dmitriy Zaporozhets 15fa14f1d6 get rid off modal window for issue create/edit 2011-11-25 23:40:12 +02:00
gitlabhq a6b9931938 fix dashboard test 2011-11-22 09:01:53 -05:00
gitlabhq b5d7fb5eed restyled user profile 2011-11-22 08:14:23 -05:00
Saito 6a4f8b997c fix specs 2011-11-22 15:55:01 +08:00
Dmitriy Zaporozhets cb4006aa8c fixed test 2011-11-19 11:22:52 +02:00
gitlabhq ccefc95e12 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2011-11-18 04:18:26 -05:00
Drew 91d5a906f9 Resolved issue #235 2011-11-18 01:52:13 -05:00
Drew 15016ae68d resolved issue 244 and updated test 2011-11-18 01:32:22 -05:00
Nihad Abbasov c4a575b70b Merge pull request #105 from SaitoWu/annotate
annotate models
2011-11-16 09:50:05 -08:00
gitlabhq f0b86c5f1e Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2011-11-16 11:43:27 -05:00
gitlabhq aa02a3b757 fix projects page 2011-11-16 11:43:16 -05:00
Nihad Abbasov e10fb64dd6 update gems in order to make it work with ruby 1.9.3 2011-11-16 18:57:37 +04:00
Saito 7b5fd14515 annotate models 2011-11-16 16:32:35 +08:00
gitlabhq a7734bba84 fix tests after refactor 2011-11-16 08:58:53 +03:00
Nihad Abbasov ed5e19a518 allow user to reset his private token 2011-11-15 17:08:20 +04:00
Nihad Abbasov 368deb5992 clean up whitespace from project 2011-11-15 12:34:30 +04:00
Nihad Abbasov 7b36b8d130 access project feeds via private token 2011-11-15 11:25:26 +04:00
Nihad Abbasov 003bf61258 add auth token for users 2011-11-15 11:08:05 +04:00
Nihad Abbasov 8d74123d61 Merge branch 'master' into features/feeds 2011-11-14 17:42:12 +04:00
Dmitriy Zaporozhets 8786aff25a project avtivity page 2011-11-12 16:19:34 +02:00
Dmitriy Zaporozhets 4dd5d9c8cc Issue #185 – Show branch name for commits on activities & dashboard pages 2011-11-12 15:18:56 +02:00
Dmitriy Zaporozhets de09e35693 refactored top panel spec 2011-11-12 12:42:05 +02:00
Nihad Abbasov f295ff84d9 create atom feed for issues 2011-11-11 13:29:58 +04:00
Nihad Abbasov 2b04c2a67f create atom feed for commits 2011-11-11 12:11:27 +04:00
Dmitriy Zaporozhets 4ecf17cf9a annotated 2011-11-11 00:08:20 +02:00
Dmitriy Zaporozhets 9a5f328313 notes should depends on user when destroy 2011-11-10 09:46:04 +02:00
Ariejan de Vroom 85468fb4ce Use secure.gravatar.com when running over SSL 2011-11-09 20:51:22 +02:00
Dmitriy Zaporozhets a44e329222 project dashboard updated 2011-11-09 01:56:10 +02:00
Dmitriy Zaporozhets 67b9fa51dc fixed tests 2011-11-07 22:31:51 +02:00
Aleksei Kvitinskii 072b2d5de8 Implement tags cloud support for projects 2011-11-05 22:22:26 +02:00
Aleksei Kvitinskii 6e08b5cc85 create tags page and made tag filter for projects 2011-11-05 21:00:05 +02:00
Dmitriy Zaporozhets 0499759204 issues & fixed layout 2011-11-05 15:31:54 +02:00
Aleksei Kvitinskii 1e5aa0efff add tags autocomplete 2011-11-05 14:57:40 +02:00
gitlabhq 020e1a8eee dashboard 2011-11-02 22:14:03 +02:00
gitlabhq 5e12f10c14 fixes 2011-11-01 22:51:20 +02:00
gitlabhq 3fa770dd10 Merge branch 'new_issue' into dev 2011-10-28 12:26:25 +03:00
gitlabhq a017181339 new issue format 2011-10-28 12:22:09 +03:00
Nihad Abbasov b6cdd1c819 test expired snippets 2011-10-28 00:25:50 +05: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 92f6de0370 If terms are removed show all results for current status 2011-10-25 20:15:11 -04:00
Adam Leonard 0955863489 Merge branch 'master' of dev.gitlabhq.com:gitlabhq into feature/issues_search 2011-10-25 18:34:59 -04:00
gitlabhq afe98ae74a Issue #149 fixed 2011-10-25 07:32:02 +03:00
gitlabhq 00290b9214 test cov 2011-10-22 14:08:03 +03:00
gitlabhq 1a9531c9a4 fix #140, commit lil refactor 2011-10-22 14:08:03 +03:00
gitlabhq 9fa4df16ec now you can view comrade profile info #134 2011-10-22 14:08:03 +03:00
gitlabhq 24f04c0a61 recent radio button 2011-10-22 14:08:02 +03:00
Adam Leonard 5b284f6adf Add ability to Search issues 2011-10-22 00:06:38 -04:00
Aleksei Kvitinskii dde2879589 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2011-10-21 16:00:27 +03:00
Aleksei Kvitinskii cee932500c now you can view comrade profile info #134 2011-10-21 15:56:37 +03:00
gitlabhq a07923a549 recent radio button 2011-10-21 14:03:34 +03:00
Aleksei Kvitinskii 59704f481e extended user profile with social fields 2011-10-20 01:34:05 +03:00
gitlabhq f8b5e5f78e dashboard 2011-10-18 17:57:01 +03:00
gitlabhq d03f2687c5 annotated 2011-10-17 18:31:21 +03:00
gitlabhq 783ca89796 security improved 2011-10-17 13:39:03 +03:00
gitlabhq 9265de3d25 snippets are ready 2011-10-17 00:07:10 +03:00
gitlabhq 57baa49bc3 project path & code regexp validation 2011-10-15 19:30:56 +03:00
gitlabhq 5f8255ac67 Fixed: invalid browse code for commit. Perfomance test added 2011-10-14 22:43:25 +03:00
gitlabhq d7ea9052f1 tests seed 2011-10-09 22:55:06 +03:00
gitlabhq 035196e7a8 test fix 2011-10-09 22:36:57 +03:00
Valera Sizov 67f0c62d07 Issue #83 - Project limit 2011-10-09 11:15:01 -07:00
Valera Sizov 9840102651 Issue #82 - Add owner to project 2011-10-09 04:05:31 -07:00
gitlabhq 9ba1224867 init commit 2011-10-09 00:36:38 +03:00