deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3371 commits 6 branches 43 tags 25 MiB
Commit graph

547 commits

Author SHA1 Message Date
Dmitriy Zaporozhets 14f5d1727a Merge branch 'milestone_api' of https://github.com/tsigo/gitlabhq into tsigo-milestone_api 
Conflicts:
	spec/requests/api/issues_spec.rb
 2012-08-29 15:35:12 +03:00
Dmitriy Zaporozhets adc71b6a6a Fix test i broke with ssk key validation. Added Key.user_id as attr_protected 2012-08-29 07:58:22 +03:00
Dmitriy Zaporozhets 5afb16e496 Add ssh key validation 2012-08-29 07:13:29 +03:00
Robert Speicher 39ff033d1a Remove pkey.example 2012-08-28 21:22:49 -04:00
Robert Speicher a3a63eeb92 Remove all instances to 'gitlabhq_x' seed repositories from specs and features 
We now need only one seed repo! Also cleans up the seeding script.
 2012-08-28 21:22:49 -04:00
Robert Speicher a39cfb5461 Simplify StubbedRepository after GitHost changes from master 2012-08-28 21:22:49 -04:00
Robert Speicher 77d06454ed Simple model spec changes made possible by new factories 2012-08-28 21:22:49 -04:00
Robert Speicher 0bc9094058 Add deploy_key and personal_key factories 2012-08-28 21:22:49 -04:00
Robert Speicher c9c1f76e00 All specs and features currently passing with FactoryGirl 2012-08-28 21:22:49 -04:00
Robert Speicher 4805c64f2a Remove spec/factory and spec/factories 2012-08-28 20:30:50 -04:00
Dmitriy Zaporozhets 2e8b5ebefd Merge pull request #1386 from tsigo/github_markup 
Use GitHub::Markup to parse markup files
 2012-09-09 03:34:50 -07:00
miks ba584c7d8d Merge branch 'master' into project_users_api 2012-09-08 20:55:08 +03:00
Robert Speicher 52c521ffe8 Use GitHub::Markup to parse markup files 
Closes #1382
 2012-09-05 16:52:49 -04:00
randx 7cdc5b9e04 Use similar interface to access gitolite 
Simplified gitolite handle logic
Stubn over monkeypatch
Stub only specific methods in Gitlab:Gitolite
Moved grach auth to lib
added specs for keys observer
removes SshKey role
 2012-08-29 00:04:06 +03:00
Alex Denisov 3c96d1f0e1 Send notification on update UserProject relation (access changed) 2012-08-27 00:32:03 +03:00
Alex Denisov aaeb37419a Send notifiation on create UserProject relation (access granted) 2012-08-27 00:13:03 +03:00
Robert Speicher 580ce4f2d8 Minor cleanup to Milestone model and spec 
Back-ported from my still-in-progress major cleanup.
 2012-08-25 14:19:16 -04:00
Robert Speicher 232389f4e8 Clean up request specs 2012-08-25 14:19:15 -04:00
Robert Speicher b2a5344a2d Add a simple api method to ApiHelpers, replacing api_prefix 
See docs for usage
 2012-08-25 14:19:15 -04:00
Robert Speicher fba174e9bc Cleanup spec/support folder and spec/spec_helper 
Changes:
* Move spec/monkeypatch to spec/support
* Remove unused support/shared_examples
* Move support/api to support/api_helpers to match module name
* Move support/login to support/login_helpers to match module name
* Move API specs to requests/api (convention over configuration)
* Remove unused support/js_patch
* Simplify login_as helper
* Move DatabaseCleaner stuff to its own support file
* Remove unnecessary configuration and requires from spec_helper
 2012-08-25 14:19:15 -04:00
Robert Speicher 852b9c28dd Move observer specs out of spec/models into spec/observers 2012-08-25 13:22:45 -04:00
randx 14bd9c9228 Fix dashboard issues atom feed rspec 2012-08-24 12:17:05 +03:00
Robert Speicher b838440f15 Deprecate the DELETE method for Issues API 
Now returns HTTP Status 405 - http://httpstatus.es/405

Closes #1245
Closes #1264
 2012-08-22 13:26:09 -04:00
Robert Speicher 0f1ca8b3e7 Remove DELETE API for Milestones 2012-08-22 13:19:55 -04:00
Robert Speicher db4c3e58bc Don't run SimpleCov on Travis 2012-08-23 07:24:25 -04:00
Dmitriy Zaporozhets 1ef1a4ae6e Merge pull request #1239 from tsigo/disable_gravatar 
Allow disabling Gravatars in gitlab.yml settings
 2012-08-22 04:33:50 -07:00
randx 3784f134f1 Merge branch 'refactor_notify' of https://github.com/tsigo/gitlabhq into tsigo-refactor_notify 2012-08-21 21:34:33 +03:00
randx 64f3682feb project should not respond to write_hooks any more 2012-08-21 20:24:04 +03:00
Robert Speicher 652d955c92 Remove some duplication in the Notify mailer 2012-08-20 23:04:53 -04:00
randx d656cb74f7 Headless gem added 2012-08-19 11:36:37 +03:00
Dmitriy Zaporozhets 4ce034ca65 Merge pull request #1247 from tsigo/feature/no_milestone_filter 
Allow filtering issues that have no milestone or assignee
 2012-08-16 22:33:56 -07:00
Robert Speicher b0a901fe01 Add API for Milestones 2012-08-16 14:52:42 -04:00
Robert Speicher 65bcc41f3e Allow disabling Gravatars in gitlab.yml settings 
Closes #1237
 2012-08-15 21:06:08 -04:00
Robert Speicher 5a90d044f7 Allow filtering by issues with no assigned... assignee 
Continues #1222
 2012-08-13 20:49:18 -04:00
Robert Speicher b1ea0b3c01 Allow filtering by issues with no assigned milestone 
Closes #1222
 2012-08-13 01:38:00 -04:00
Dmitriy Zaporozhets 463644c882 rspec to capybara-webkit. simplercov now use cucumber 2012-08-13 08:32:10 +03:00
Robert Speicher 42d3295d3d Revert 1.9 Hash syntax in ValidCommit::BLOB_FILE 
Features are still expecting the 1.8 syntax, which is fine in this case.
 2012-08-10 18:38:13 -04:00
Robert Speicher 7754189187 Fully embrace Ruby 1.9 hash syntax 
Didn't bother with files in db/, config/, or features/
 2012-08-10 18:25:15 -04:00
Dmitriy Zaporozhets 1413c23c50 Merge pull request #1208 from tsigo/issue_commonality 
Consolidate functionality shared between Issue and MergeRequest
 2012-08-10 06:48:16 -07:00
Robert Speicher b7f9b8223e Fix search class method for IssueCommonality 
Also adds specs to the two affected classes that would have caught my
dumb mistake.
 2012-08-09 13:45:12 -04:00
Dmitriy Zaporozhets a8ce107c64 Cucumber feature -> Merge Request 2012-08-09 08:13:29 +03:00
randx 04bad8257f Fixed markdown tests 2012-08-08 11:52:09 +03:00
Riyad Preukschas 5443021a0e Update notifications mails and notify specs for GFM 2012-08-06 05:08:22 +02:00
Riyad Preukschas 6f9428b1cd Fix GFM helper to raise an exception when @project is not set 2012-08-06 02:32:17 +02:00
Riyad Preukschas 90c2cd1ee6 Fix GFM specs for ids in markdown headings 2012-08-06 02:31:16 +02:00
Riyad Preukschas 8e6a7a172e Merge branch 'master' into gitlab-flavored-markdown 2012-08-06 01:48:20 +02:00
randx 4a437cdf86 Remove useless Protected branch test 2012-08-02 09:05:00 +03:00
Dmitriy Zaporozhets 9844ddd43f Comments cucumber. More refactoring. Cucumber -> branches, tags 2012-08-03 19:59:55 +03:00
Dmitriy Zaporozhets 1281c122c7 Issues cucumber. refactored step_definitoons 2012-08-03 19:49:54 +03:00
Dmitriy Zaporozhets b846ac1059 Milestones cucumber. Renamed app security test 2012-08-03 19:39:54 +03:00
Dmitriy Zaporozhets 6de4882597 Remove duplicate coverage in spec requests. All features should be covered in cucumber 2012-08-03 19:29:54 +03:00
Riyad Preukschas 204964918b Add specs for using GFM on a variety pages 2012-08-02 02:54:54 +02:00
Riyad Preukschas 0a60b19b23 Remove the commit_msg_with_link_to_issues helper and specs 2012-08-02 02:54:10 +02:00
Riyad Preukschas 24ec186a83 Update Gitlab Markdown renderer to use GFM 2012-08-02 02:54:05 +02:00
Riyad Preukschas 6873d07f62 Add link_to_gfm helper and specs 2012-08-02 02:54:01 +02:00
Riyad Preukschas de2770bba9 Add GFM helper specs 
tests references to
* commits
* team members
* issues
* merge requests
* snipptes
 2012-08-02 02:26:21 +02:00
Nihad Abbasov d63706d72c Merge pull request #1157 from CodeAdept/api_blob_contents 
API blob contents
 2012-07-31 23:37:48 -07:00
Jeremy Anderson 69c4cea65a updating project api to include raw blob contents and single branch 2012-07-31 07:32:44 -07:00
Dmitriy Zaporozhets 5926bbac12 Backend Refactoring 2012-07-31 08:32:49 +03:00
randx 69e41250d1 Styled New/Edit Project for admin area 2012-07-28 00:42:44 +03:00
Dmitriy Zaporozhets e1344a08f0 Merge pull request #1163 from tomykaira/bug_1009 
Fix #1009 Replace all special characters in user's identity
 2012-07-28 07:46:40 -07:00
tomykaira 03a2995e15 Fix #1009 Replace all special characters in user's identity 2012-07-28 22:05:25 +09:00
randx 3caf0aa89a fix commits spec 2012-07-28 00:40:14 +03:00
randx 61c85332d2 Merge branch 'add_wiki_comments' of git://github.com/seeingidog/gitlabhq into seeingidog-add_wiki_comments 
Conflicts:
	app/controllers/admin/mailer_controller.rb
	app/controllers/notes_controller.rb
 2012-07-25 21:36:30 +03:00
Dmitriy Zaporozhets 5133541f25 Merge pull request #1127 from riyad/use-decorators 
Use CommitDecorator more
 2012-07-25 11:25:55 -07:00
Nihad Abbasov cb32e0320a return 404 if project not found 2012-07-25 05:24:28 -07:00
Nihad Abbasov 1b95c8bff3 API: ability to get project by id 2012-07-25 02:18:30 -07:00
Nihad Abbasov eca823c1c7 Merge branch 'master' into api 2012-07-24 05:46:36 -07:00
Nihad Abbasov 7b33d8cbca add issues API 2012-07-24 05:19:51 -07:00
Riyad Preukschas f9877c529e Update specs 2012-07-22 13:08:32 +02:00
Dmitriy Zaporozhets 60ee383eb9 Enable observe for system hooks 2012-07-20 12:08:59 +03:00
Ian Morgan 36efa2042c Add comments to Wiki pages 2012-07-19 20:23:55 -04:00
Valeriy Sizov 86bd11cbd8 System Hooks: rspec 2012-07-19 00:25:10 +03:00
Valeriy Sizov 655418bed2 System hooks: fix broken tests 2012-07-19 00:25:10 +03:00
Dmitriy Zaporozhets a3bb9ca1fa Feature: Unassigned Merge Requests 2012-07-17 08:19:16 +03:00
m16a1 a46a172ad9 Update master 2012-07-13 17:10:30 +04:00
Dmitriy Zaporozhets d40b9ce26d Admin gitolite logs. Refactored project creation. Few style fixes. 2012-07-05 21:59:37 +03:00
Dmitriy Zaporozhets 3ce629fded Merge pull request #1034 from NARKOZ/api 
API version
 2012-07-04 08:36:06 -07:00
Nihad Abbasov 61910eb8fa ability to update and get a raw snippet via API 2012-07-04 02:03:32 -07:00
Nihad Abbasov fbd559d44f add API version 2012-07-04 00:48:00 -07:00
Dmitriy Zaporozhets a2eda66b30 Disable issues sort. Recent issues on top. Fixed tests 2012-07-02 21:51:48 +03:00
Dmitriy Zaporozhets 9b337b8328 Epic: Gitlab configuration with default values 2012-07-02 21:51:48 +03:00
Nihad Abbasov 378dc55d29 add project snippets API 2012-06-29 06:34:08 -07:00
Nihad Abbasov 84a3f8fca4 show only current user projects 2012-06-28 07:02:20 -07:00
Nihad Abbasov 7b5c3cc8be add projects API 2012-06-28 03:44:20 -07:00
Nihad Abbasov 4ad91d3c11 add users API 2012-06-28 03:43:41 -07:00
Dmitriy Zaporozhets 4c1f435ab7 Merge pull request #971 from gingko/master 
Automatic password creation..
 2012-06-26 23:41:49 -07:00
Jakub Troszok 4426bc1844 Added option to automaticaly generate passwords for new users. 2012-06-26 23:59:08 +02:00
randx 88c625e3f7 Issues can be unassigned now 2012-06-26 21:47:25 +03:00
randx 6abc649590 Reannotated 2012-06-26 21:23:09 +03:00
Jakub Troszok bea0583951 Added tests for automatic password generation. 2012-06-24 22:51:58 +02:00
randx 55f8338502 Merge branch 'separate_user_and_issue_observer_from_mail_observer' of https://github.com/robbkidd/gitlabhq into robbkidd-separate_user_and_issue_observer_from_mail_observer 2012-06-24 09:33:22 +03:00
randx 77cf662034 Pushed widget improved 2012-06-21 18:41:22 +03:00
Robb Kidd 65989141dc Protect IssueObserver#send_reassigned_email method. 2012-06-20 21:23:05 -04:00
Robb Kidd 88964132ed Extract observation of User to a UserObserver 2012-06-20 14:09:46 -04:00
Robb Kidd 97ca4f5dda Deliver issue mails. 
It helps to actually deliver messages.
 2012-06-20 14:09:46 -04:00
Robb Kidd dfb5da9da3 Disable observers in specs. Enable only when observer is under test. 
Used the built-in observer enable/disable feature in ActiveModel[1].
ActiveRecord::Base includes ActiveModel::Observing which provides this
behavior.

Simple wraps to enable the observer under test were added to the specs
for: ActivityObserver, IssueObserver, Admin::Users and Issues.

The spec for Project.last_activity was refactored to separate the tests
for #last_activity and #last_activity_date. Each had doubles added to
isolate the spec from the hidden dependency on the ActivityObserver
action to create an Event for the project when an Issue is created. This
ActivityObserver behavior is already tested by its spec.

[1] http://api.rubyonrails.org/classes/ActiveModel/ObserverArray.html
 2012-06-20 14:09:46 -04:00
Robb Kidd 5303cc285a Add resque_spec to test queuing mail. 2012-06-20 14:09:46 -04:00
Robb Kidd 6617eaaf9b Make IssueObserver handle issus, not MailerObserver 2012-06-20 14:09:46 -04:00
Robb Kidd 356430c3c0 Add method for an issue to know whether it is being closed 
Update IssueObserver to create a Note on the issue its being closed.
 2012-06-20 14:09:46 -04:00
Robb Kidd 02924de3e1 Add method to Note to create notes about status changes. 2012-06-20 14:09:46 -04:00
Robb Kidd 00ec81eacb Update IssueObserver to send reassigned emails when an issue is reassigned. 2012-06-20 14:09:46 -04:00
Robb Kidd 2416e3cb19 Add new utility method for an issue to know whether it is being reassigned 2012-06-20 14:09:46 -04:00
Robb Kidd f6035552e5 New IssueObserver class and spec. 
Handles emails for new issues and reassigned issues.
Need to add creating a Note on Issue close.
 2012-06-20 14:09:46 -04:00
Dmitriy Zaporozhets 5bbf3ccf05 Cucumber: 
* Profile
* Browse code
* Sceleton for main features
* Wiki
* Commits
 2012-06-15 07:15:28 +03:00
Nihad Abbasov 51c30d90d4 fix broken spec 2012-06-13 05:36:51 -07: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 b96af79bb8 Specs for last push widget 2012-06-12 21:15:34 +03:00
Nihad Abbasov cc3c6ad0ef allow login via private token only for atom feeds 2012-06-01 06:56:28 -07:00
Nihad Abbasov f8f6ff065e add projects atom feed 2012-05-31 23:42:02 -07:00
Nihad Abbasov 475d9f487f use ffaker gem 2012-05-29 17:35:34 +05:00
Nihad Abbasov faa0ec7c63 cleanup User model 2012-05-29 17:13:41 +05:00
Nihad Abbasov fc74627f3c fix typo in spec file name 2012-05-29 17:11:55 +05:00
randx b729004a50 [Tests] Update team member permission 2012-05-27 20:52:40 +03:00
randx 2a67879b75 [Tests] Fixed graph test 2012-05-27 13:40:43 +03:00
randx 9cd1069a8c [Tests] Better project coverage 2012-05-27 13:39:57 +03:00
randx baa54629a9 [Tests] added spec for search page 2012-05-27 13:22:23 +03:00
randx 3272620f72 lib/ refactoring. Module Gitlabhq renamed to Gitlab 2012-05-26 13:37:49 +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
Robb Kidd 0dd87789a1 Update Notify spec to use host set in config/gitlab.yml 
Fixes failing tests introduced in pull request #824
 2012-05-16 11:25:18 -04:00
Robb Kidd e660043d22 Make Notify#new_merge_request_email resque friendly. 2012-05-15 22:37:34 -04:00
Robb Kidd 39061af9f8 Make Notify#new_issue_email resque friendly. 2012-05-15 22:37:34 -04:00
Robb Kidd 41c00a20a9 Make Notify#note_wall_email resque friendly 
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
 2012-05-15 22:37:34 -04:00
Robb Kidd 0a9a2c2a0b Make Notify#note_commit_email resque friendly 
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off. Also, the faux SHA1 cannot have underscores or
it will not match the commit pattern defined in the routes.
 2012-05-15 22:37:34 -04:00
Robb Kidd 435fd8f087 Make Notify#note_issue_email resque friendly 
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
 2012-05-15 22:37:34 -04:00
Robb Kidd bb22360d1a Make Notify#note_merge_request_email resque friendly 
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
 2012-05-15 22:37:33 -04:00
Robb Kidd 5fe75649b3 Rename changed_mr_email to reassigned_mr_email & make resque friendly 
#changed_merge_request_email was really sending emails about merge
request reassignments. Updated method name to reflect that.

Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
 2012-05-15 22:37:33 -04:00
Robb Kidd dd921053c8 Rename changed_issue_email to reassigned_issue_email & make resque friendly 
#changed_issue_email was really sending emails about issue reassignments.
Updated method name to reflect that.

Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
 2012-05-15 22:35:53 -04:00
Robb Kidd 345f176a74 Update new_user_email to take id for User and perform find itself. 2012-05-15 22:35:53 -04:00
Robb Kidd 06b45acb8f Add specs for all of the emails. 2012-05-15 22:35:53 -04:00
Robb Kidd c7489578e6 Add specs for Notify ActionMailer emails. 
Covers new user, new issue and wall note emails.

Depends on email_spec (https://github.com/bmabey/email-spec/) for
friendly matchers.
 2012-05-15 22:35:53 -04:00
Robb Kidd d50446088c Add spec for ProtectedBranch. 2012-05-10 22:43:12 +00:00
Dmitriy Zaporozhets 28cb43135c Hooks UI improved, Request tests added 2012-04-26 20:43:12 +03:00
gitlabhq c9af8e7579 New project page improved. User profile improved. Show issues, participant on Milestone show page. 2012-04-24 21:49:34 +03:00
gitlabhq d97a9aa4a4 fixed email markdown 2012-04-23 15:32:56 +03:00
Dmitriy Zaporozhets 86d7b4f152 removed old spec 2012-04-14 11:36:53 +03:00
Dmitriy Zaporozhets 2bad798e11 fixed tests 2012-04-09 01:29:15 +03:00
Dmitriy Zaporozhets d98b183361 first pack of tests for milestones 2012-04-09 01:01:42 +03:00
Dmitriy Zaporozhets 23d950855d Milestone basic scaffold 2012-04-09 00:28:58 +03:00
randx 897da534fa Fix issues with push 600+ commits. refactored, improved push events 2012-04-04 07:39:04 +03:00
Dmitriy Zaporozhets f1799a239f fixed project spec 2012-04-02 08:50:37 +03:00
Dmitriy Zaporozhets 8ee0993fdf Event & Wiki models specs 2012-03-28 22:53:45 +03:00
Dmitriy Zaporozhets 39ea486e1f Fixed specs. Some css fixes 2012-03-25 19:44:29 +03:00
Dmitriy Zaporozhets cadf12c60c Merged activities & projects pages 2012-03-20 00:05:35 +02:00
Dmitriy Zaporozhets 724ea16c34 Activities page added. Dashboard few specs. Preparing for 2.3 2012-03-19 22:52:16 +02:00
Dmitriy Zaporozhets e2b3951700 Some test covering merge request update hook 2012-03-16 01:32:46 +02:00
Dmitriy Zaporozhets a4993f16c0 Fixed migration, test for MR 2012-03-15 19:39:03 +02:00
Ariejan de Vroom 2d00f2dfe4 Added 'x notes' and +1 counters to issues and merge requests. Refs #549 2012-03-15 00:51:03 +02:00
Ariejan de Vroom 8d8b82127f Count +1 votes in issue notes. 2012-03-14 15:31:31 +02:00
Dmitriy Zaporozhets 3676838dc9 Rspec test repo replaced.\nMerge Requests improved 2012-03-13 23:54:49 +02:00
Dmitriy Zaporozhets 71d6582c9f fixed spec coma 2012-03-12 21:51:57 +02:00
Dmitriy Zaporozhets a9ef0bc343 test fix, css refactoring 2012-03-07 23:55:46 +02:00
Dmitriy Zaporozhets cb59aade4e Cleaning and refactoring 2012-03-06 00:26:40 +02:00
Dmitriy Zaporozhets 0727edd8a0 Removed issues,mr delete buttons. Refactored models 2012-03-04 15:35:15 +02:00
Dmitriy Zaporozhets b603e0dc45 Fixed spec 2012-03-01 22:56:24 +02:00
Ariejan de Vroom 219ac18980 Updated specs for post_receive worker 2012-03-01 16:43:04 +01:00
Ariejan de Vroom b0ce61c4f2 Merge branch 'deploy_keys_nonunique' of https://github.com/miks/gitlabhq into miks-deploy_keys_nonunique 
Added/fixed specs
Update spec/factory to allow Factory#new without opts

Conflicts:
	app/models/key.rb
 2012-03-01 16:00:14 +01:00
Dmitriy Zaporozhets 25bde28d13 Fixed tests. removed delegate to id 2012-02-29 23:04:09 +02:00
Dmitriy Zaporozhets fa07c9d662 register push event 2012-02-28 16:48:15 +02:00
Dmitriy Zaporozhets dcdb2fdfdb Observe issue, merge request, note creation - create event 2012-02-28 16:01:14 +02:00
Dmitriy Zaporozhets a847501fd2 Event entity created 2012-02-28 15:09:23 +02:00
Dmitriy Zaporozhets 292a41cbe2 Fixed comments for snippets. Tests fixed 2012-02-24 22:36:44 +02:00
Dmitriy Zaporozhets ce8eba8913 Merge branch 'wiki' 
Conflicts:
	app/views/layouts/_project_menu.html.haml
 2012-02-21 20:32:43 +02:00
vsizov 621bfdb4aa wiki: rspec 2012-02-21 20:18:06 +03:00
Dmitriy Zaporozhets 5f4a7c3e04 Home tab added, Repository tab removed\n Ability to download branch 2012-02-20 08:38:03 +02:00
Valery Sizov eacea15a21 wiki base sceleton 2012-02-19 19:50:13 +02:00
Dmitriy Zaporozhets 94db8a1c33 Usability & design improvements 2012-02-18 14:12:48 +02:00
Dmitriy Zaporozhets 1c62ec09b0 4 roles permission system 2012-02-16 09:03:55 +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 bc3735004c Moving to rails 3.2 2012-02-11 20:34:25 +02:00
Dmitriy Zaporozhets cc043f32d8 Admin area improved 2012-02-11 19:56:18 +02:00
Dmitriy Zaporozhets bbb0d24d5c fix test crash after rename link 2012-02-08 20:26:31 +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 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