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

520 commits

Author SHA1 Message Date
Dmitriy Zaporozhets d005242d23 Merge pull request #1803 from gitlabhq/api_merge_request 
Api for merge request
 2012-10-25 03:49:31 -07:00
Valeriy Sizov 56bf829c75 API: fix after review 2012-10-25 13:19:18 +03:00
Valeriy Sizov e6cdfb607a API: tests for merge_requests 2012-10-25 13:13:01 +03:00
Dmitriy Zaporozhets b7a9e41bd2 Handle perfomance issue with team import. Model specs 2012-10-24 14:52:17 +03:00
Nihad Abbasov b1ef7d7a44 fix typo in spec 2012-10-19 03:41:09 -07:00
Nihad Abbasov 0369c74e58 fix wrong test case 2012-10-19 03:28:26 -07:00
Nihad Abbasov 2dc0f098fd fix typos in specs 2012-10-19 03:25:39 -07:00
Nihad Abbasov c610206321 fix mass-assignment error in user create API 2012-10-19 03:23:10 -07:00
Riyad Preukschas 413778b645 Rename NoteObserver methods and clarify things 2012-10-18 01:14:10 +02:00
randx db469ea3e6 Fixing broken test of project last_activity 2012-10-17 22:35:08 +03:00
randx e0c43c46dd Added project has_one :last_event assoc. Fixed tab line-height after font-awesome. Increased projects per page on dashboard 2012-10-17 22:02:52 +03:00
Dmitriy Zaporozhets e84d90c1e7 Merge pull request #1692 from riyad/saner-note-methods 
Small Note code cleanup
 2012-10-15 10:11:00 -07:00
Robb Kidd 9588a23242 Fix notification for notes on a wall. 
The fact that Notes on Walls have a noteable_type value of "nil" got
lost in the refactoring of the observer.
 2012-10-13 14:37:36 -04:00
Riyad Preukschas b1461de993 Make Note methods saner 2012-10-13 16:23:12 +02:00
Valeriy Sizov 89a349f9a5 Merge pull request #1685 from jozefvaclavik/master 
Hooks API (List one hook & edit)
 2012-10-12 02:23:53 -07:00
jozefvaclavik 96abbf02e3 Update spec/requests/api/projects_spec.rb 
Fixed mistake with updating project hook
 2012-10-12 11:30:39 +03:00
jozefvaclavik 3f2e04254f Update projects_spec.rb for Hook list and edit 
Also (I think) I found few mistakes with snippets requests.
 2012-10-12 11:00:59 +03:00
Robb Kidd 378fe076b6 Reduce complexity: replace case statement with method lookup. 2012-10-11 13:27:58 -04:00
Robb Kidd 16ceae895e Separate observing of Note and MergeRequests 
* Move is_assigned? and is_being_xx? methods to IssueCommonality

  This is behavior merge requests have in common with issues. Moved
  methods to IssueCommonality role. Put specs directly into
  merge_request_spec because setup differs for issues and MRs
  specifically in the "closed" factory to use.

* Add MergeRequestObserver. Parallels IssueObserver in almost every way.

  Ripe for refactoring.

* Rename MailerObserver to NoteObserver

  With merge request observing moved out of MailerObserver, all that
  was left was Note logic. Renamed to NoteObserver, added tests and
  updated application config for new observer names. Refactored
  NoteObserver to use the note's author and not rely on current_user.

* Set current_user for MergeRequestObserver

  IssueObserver and MergeRequestObserver are the only observers that
  need a reference to the current_user that they cannot look up on
  the objects they are observing.
 2012-10-10 17:59:25 -04:00
Dmitriy Zaporozhets dda852a0d5 Merge pull request #1629 from riyad/show-notes-indicator-for-commits-and-merge-requests 
Show numer of notes for commits and merge requests
 2012-10-10 01:45:39 -07:00
Riyad Preukschas 6dc8c0eac2 Make MRs also count and display its commits' notes 2012-10-10 01:31:36 +02:00
Riyad Preukschas eb92813757 Move emoji auto-complete helper to ApplicationHelper 2012-10-10 00:53:42 +02:00
Riyad Preukschas bbd92e57cb Add emoji_for_completion helper 2012-10-09 14:47:42 +02:00
Dmitriy Zaporozhets 41e53eb980 Annotated 2012-10-09 11:14:17 +03:00
Andrey Kumanyaev a4cd738686 tests fix 2012-10-09 04:10:16 +04:00
Nihad Abbasov 61f12da3a5 API: add project snippets listing 2012-10-08 02:13:53 -07:00
Dmitriy Zaporozhets 74213534bc Fix tests 2012-10-05 17:01:44 +03:00
Robert Speicher 58dad2b954 Remove leftover ref_extractor_spec file 
Apparently it didn't get removed after the rename to ExtractsPath.
 2012-10-04 14:31:11 -04:00
Robert Speicher 3606a14889 ExtractsPath: Use ref_names instead of branches+tags 2012-10-04 14:13:52 -04:00
Valeriy Sizov e25ddca0c4 Fix bug with branches whose name contains slash 2012-10-04 19:31:31 +03:00
Valery Sizov 9e80d2d4f7 Merge branch 'feature/groups' of dev.gitlabhq.com:gitlabhq 2012-10-03 12:17:48 +00:00
Valeriy Sizov dc22dd8ade Factories spec refactoring after #1616 2012-10-03 13:33:31 +03:00
Valeriy Sizov b5f9d29f55 Merge pull request #1617 from dosire/reject-ssh-keys-that-break-gitolite 
Reject ssh keys that break gitolite
 2012-10-03 03:18:08 -07:00
Robert Speicher 5e3be9cda0 Cache the value of safe_message 
Also, just for extra paranoia, only call safe_message once in the
decorator methods

Adds specs to make sure it still works
 2012-10-02 19:00:41 -04:00
Dmitriy Zaporozhets d683ce5c10 refactored factory + fixed tests 2012-10-02 18:20:46 +03:00
Dmitriy Zaporozhets fa3ae24ca7 Group entity. Group has many projects 2012-10-02 18:17:12 +03:00
Valeriy Sizov c4883ca225 Update linguist and pygments #1602 2012-10-02 16:29:03 +03:00
Valeriy Sizov bda0a75581 #1585 Api for user creation: rspec 2012-10-02 13:59:22 +03:00
randx db69836319 Move ProjectHooks from spec/requests to spinach 2012-09-27 23:52:08 +03:00
randx 9cabe04368 tests for: Profile -> History 2012-09-27 23:23:11 +03:00
Robert Speicher f064c84019 Add nav_link helper to TabHelper 2012-09-26 16:32:26 -04:00
Robert Speicher aa0c4b77b6 Add current_action? helper 2012-09-26 16:32:26 -04:00
Robert Speicher afc4a75499 Use Rails.root.join where appropriate 2012-09-26 16:32:26 -04:00
Robert Speicher 7df25e77ac Speed up request specs a bit 2012-09-26 16:32:26 -04:00
Robert Speicher 2df3b310f9 Rename branches and tags Repo methods to branch_names and tag_names 2012-09-26 16:32:26 -04:00
Robert Speicher 5cea3e576d Remove atom Dashboard spec that no longer applies 2012-09-26 16:32:26 -04:00
Robert Speicher 67fd743294 Clean up project access spec 2012-09-26 16:32:26 -04:00
Robert Speicher cf237f1d32 Fix GFM request spec 2012-09-26 16:32:26 -04:00
Robert Speicher 9f0e80591a Fix Repository role spec 2012-09-26 16:32:25 -04:00
Robert Speicher 1799cf3b49 Add CommitsController spec to make sure atom feeds work 2012-09-26 16:32:25 -04:00
Robert Speicher 6cb626ef51 Add Compare#index and Compare#create actions 
Create just redirects to our specially-formatted #show action
 2012-09-26 16:32:24 -04:00
Robert Speicher 6b90f36f5b Updates to routing specs 2012-09-26 16:32:24 -04:00
Robert Speicher 60ac6a28a2 Allow current_controller? helper to take an Array of options 2012-09-26 16:32:24 -04:00
Robert Speicher 3ad931ca92 Add current_controller? helper method 
Simplifies some of the "active tab" checks we're doing
 2012-09-26 16:32:23 -04:00
Robert Speicher f1c6bd8df3 Factories - Format project path and code 2012-09-26 16:32:23 -04:00
Robert Speicher 169f16fb32 Remove Commits#compare, add CompareController 2012-09-26 16:32:22 -04:00
Robert Speicher a1e68a9120 Rename RefExtractor to ExtractsPath 
Update docs a bit
 2012-09-26 16:32:22 -04:00
Robert Speicher a8ea8d98a4 Update RefExtractor to handle atom feeds 2012-09-26 16:32:22 -04:00
Robert Speicher 576cec6c67 Add BlobController, remove Refs#blob 2012-09-26 16:32:22 -04:00
Robert Speicher 39c6579306 Add BlameController, remove Refs#blame action 2012-09-26 16:32:22 -04:00
Robert Speicher 37f0b600bc Another RefExtractor refactor 2012-09-26 16:32:22 -04:00
Robert Speicher 79a02df92e Update usages of tree_file_project_ref_path to project_tree_path 2012-09-26 16:32:21 -04:00
Robert Speicher e33cbb9b42 Add TreeController and spec 2012-09-26 16:32:21 -04:00
Robert Speicher 884eb73297 Enable tree resource, remove old tree routes 2012-09-26 16:32:21 -04:00
Robert Speicher 567767bcf2 Add ref_extractor helper module for upcoming controllers 2012-09-26 16:32:21 -04:00
Robert Speicher b389247c02 Use Commit#show instead of Commits#show to view a single commit 
Commits#show (plural) is going to be for showing commit history on a
specific path.
 2012-09-26 16:32:21 -04:00
Robert Speicher bde5088525 Add routing specs for new routes 2012-09-26 16:32:20 -04:00
Nihad Abbasov 83efcabc82 set activerecord whitelist_attributes to true 2012-09-26 11:18:35 -07:00
Alex Denisov 965b6701ab Comment removed 2012-09-26 17:01:13 +03:00
Alex Denisov c09d233611 Merge branch 'master' into fix_project_access_notification 2012-09-26 16:14:47 +03:00
Marin Jankovski 5928388b1c Protect users projects_limit from mass assignment. 2012-09-26 13:20:44 +02:00
Marin Jankovski 7284c58c5f Don't test if invalid key is valid. 2012-09-25 16:13:24 +02:00
Marin Jankovski 012dc2278c Valid key for deploy keys spec test. 2012-09-25 16:13:13 +02:00
Sytse Sijbrandij f3ce02b5c9 Reject ssh keys that break gitolite. 
Failing test.

Working check.
 2012-09-24 16:48:10 +02:00
Nihad Abbasov 1bae64d7f6 whitespace 2012-09-21 04:53:13 -07:00
Nihad Abbasov b62445813d API: SSH keys belong to user entity 2012-09-21 04:49:28 -07:00
Nihad Abbasov 4a072be2d7 API: commits belong to project repository 2012-09-21 04:34:07 -07:00
Dmitriy Zaporozhets 131553627d Merge pull request #1521 from NARKOZ/api 
API for project team members
 2012-09-21 04:19:16 -07:00
Nihad Abbasov 25b745271a add API for project team members 2012-09-21 03:23:17 -07:00
Dmitriy Zaporozhets 10d3a30b25 APi for commits. Better api docs 2012-09-21 13:22:30 +03:00
randx d12579aa43 Merge branch 'api' of https://github.com/NARKOZ/gitlabhq into api 2012-09-20 19:35:45 +03:00
Nihad Abbasov a605943d76 fix broken spec 2012-09-20 22:11:15 +06:00
Nihad Abbasov b08d33f6a9 API: return 401 for invalid session 2012-09-20 08:38:08 -07:00
Dmitriy Zaporozhets 9aafe77e70 I want be able to get token via api. Used for mobile applications 2012-09-20 17:45:07 +03:00
Alex Denisov e6ce47291b master merged 2012-09-20 10:25:29 +03:00
Robert Speicher 496f88afe1 Escape text passed to gfm by link_to_gfm 2012-09-19 19:42:26 -04:00
Robert Speicher 01974185a1 Simplify is_within matcher 
[ci skip]
 2012-09-19 12:14:42 -04:00
Alex Denisov b6c6a5b159 Merge branch 'master' into ssh_keys_api 2012-09-16 22:37:50 +03:00
Robert Speicher f4b14494ef Move project-related routing specs to their own file 2012-09-16 12:42:52 -04:00
Alex Denisov 87d40fd276 Docs added 2012-09-16 18:21:59 +03:00
Alex Denisov c23eb40829 SSH Keys API implemented 2012-09-16 17:52:06 +03:00
Robert Speicher 02b24cefc7 Missed a use of team_project_path 2012-09-16 10:38:01 -04:00
Robert Speicher 95bd93fe1a Remove Projects#team action 
Uses TeamMembers#index instead, to be more RESTful
 2012-09-16 10:07:06 -04:00
Robert Speicher 83f24de352 Add routing specs 2012-09-16 10:06:21 -04:00
randx a82977c648 A bit of test refactoring 2012-09-15 01:00:59 +03:00
Dmitriy Zaporozhets dc37c8aaae Refactored profile area 2012-09-14 19:13:25 +03:00
Robert Speicher d993f66642 Fix HTML entities being parsed in GFM 
Also fixes the spec so that it actually tests the thing it says it's
testing. Hooray!

Closes #1308
 2012-09-13 15:20:00 -04:00
Robert Speicher 0d77209ea0 Be more resilient in the case of missing omniauth settings 
Should no longer freak out when omniauth settings aren't present in
gitlab.yml. People who aren't using it shouldn't even have to put a
'false' entry in their config for it (and probably wouldn't, after an
upgrade).
 2012-09-12 18:11:59 -04:00
Dmitriy Zaporozhets 3643df1f7c Merge pull request #1411 from miks/project_hooks_api 
Project hooks API
 2012-09-12 12:16:35 -07:00
Dmitriy Zaporozhets 6233fb6b5d Merge pull request #1446 from NARKOZ/refactoring 
specs DRY up
 2012-09-12 09:08:42 -07:00