8b54b7233e
Async perform for add/remove team members
2013-01-28 17:39:02 +02:00
bd94854929
fix tests
2013-01-28 08:59:34 +02:00
7175b6a769
Fixed dashboard show specs
2013-01-27 13:20:23 +02:00
aa1f1eb680
Merge pull request #2746 from gitlabhq/features/teams
...
New feature: Teams
2013-01-25 00:46:20 -08:00
3ce79e0658
fix spec
2013-01-25 10:10:12 +02:00
690db9693f
fix tests
2013-01-24 22:31:48 +02:00
eb99feb4a7
simple refactoring
2013-01-24 22:31:48 +02:00
a5ce8696a6
remove unused autogenerated files
2013-01-24 22:31:48 +02:00
1dd0feacc7
move Team_members controller into project (conflicts with team/members controller)
2013-01-24 22:31:25 +02:00
497f7ab5ba
save autogenerated files
2013-01-24 22:31:25 +02:00
b8dadd6427
repair rspec (remove and rename files)
2013-01-24 22:31:25 +02:00
cca9935970
save generated files
2013-01-24 22:31:24 +02:00
c5f427b0a4
save commit
2013-01-24 22:31:24 +02:00
17e9207dff
add user team factories
2013-01-24 22:31:24 +02:00
8a86fe7bb0
Added UserTeam core models (team and m-t-m relationships) and updated other models
2013-01-24 22:31:23 +02:00
79b9249ff4
Remove relative_url_root from path. Fixes #2602
...
Files and Commits render a 404 when running with relative_url_root.
2013-01-23 17:29:46 +09:00
e982a9512e
fix tests
2013-01-22 17:25:35 +02:00
3a1022e381
Increase Issue description size to 10k. Fixes #2545
2013-01-19 12:09:23 +02:00
6f05ea4f6e
Improve CreateContext call. Fixed test
2013-01-18 20:21:13 +02:00
296cdd591f
Add optional signup.
2013-01-18 11:57:31 +01:00
886cf2f5be
Fix GFM specs
2013-01-17 02:00:09 +01:00
2bc78739a7
Fix parsing of ref-like Urls in links and images in GFM
...
Fixes #2166
2013-01-16 22:39:56 +01:00
16b5417842
Use image Urls for Emoji in GFM
...
Fixes #2617
2013-01-16 22:39:45 +01:00
7635afd0c4
Use Urls for references in GFM
2013-01-16 22:08:01 +01:00
fd522b3257
should be green build now :)
2013-01-15 19:18:52 +02:00
cc54c66fd0
Fix spec/requests/notes_on_merge_requests_spec.r
2013-01-15 18:20:58 +02:00
752eb2c11d
more tests fixed
2013-01-15 16:36:35 +02:00
b059de2ac7
Fix notes model specs
2013-01-15 15:19:14 +02:00
2191efd8ec
fix notes_on_wall specs
2013-01-15 15:04:22 +02:00
ac983319d3
fixing some test
2013-01-15 12:42:54 +02:00
d28176b132
Replace commit diff note request specs with spinach features
2013-01-15 00:52:57 +01:00
f8e1f4a7c9
Replace commit note request specs with spinach features
2013-01-15 00:52:55 +01:00
3022786948
Merge commit 'master' into discussions
...
Conflicts:
app/assets/stylesheets/sections/notes.scss
app/contexts/notes/load_context.rb
app/models/project.rb
app/observers/note_observer.rb
app/roles/votes.rb
app/views/commit/show.html.haml
app/views/merge_requests/_show.html.haml
app/views/merge_requests/diffs.js.haml
app/views/merge_requests/show.js.haml
app/views/notes/_note.html.haml
features/steps/project/project_merge_requests.rb
spec/models/note_spec.rb
2013-01-15 00:52:25 +01:00
8ee5fce9d6
Add preliminary specs for notes on merge requests
2013-01-15 00:27:59 +01:00
74e48f070f
Smaller fixes
2013-01-15 00:27:26 +01:00
9773ccc451
sidekiq with green tests
2013-01-09 09:14:05 +03:00
2f6603e581
A bit of spinach tests
2013-01-09 08:14:05 +03:00
31e3dc600a
Fix routing specs
2013-01-09 09:47:25 +02:00
92a619ad28
organize simplecov
2013-01-07 22:23:13 +02:00
8c604c9d31
Add specs for notes on wall
2013-01-05 22:58:36 +01:00
1883e0830c
Add specs for notes on commits
2013-01-05 22:58:27 +01:00
5a214ee6f1
Remove unused methods
2013-01-05 13:11:15 +02:00
e3d7ce2cc4
Tests are fixed now
2013-01-05 12:12:02 +02:00
de6fa5dd52
Fix security spec
2013-01-05 00:49:43 +02:00
9a88e4d184
Fix some tests. Use travis-ci 1.9.2
2013-01-05 00:43:32 +02:00
e16cebac3e
Fixed styles, ProjectHook specs etc
2013-01-05 00:35:38 +02:00
c6298678f5
use ui-box as for all
2013-01-04 23:35:31 +02:00
ef5b36eaaf
Fixed protected branches and file edit
2013-01-04 21:45:30 +02:00
afbdbb0c95
Rspec fixes
2013-01-04 18:50:31 +02:00
dccd8b6eaa
Continue refactoring. Use repostory and team
2013-01-04 08:43:25 +02:00
39ba934c0a
REpostiry, Team models
2013-01-03 21:09:18 +02:00
e6c0673ef1
Rspec models Milestone, Commit, UsersProject
2013-01-03 19:11:14 +02:00
2095780f24
fix tests
2013-01-03 12:37:12 +02:00
d6036f08aa
move activated? method to service
2013-01-03 09:52:14 +02:00
ce84e3f440
Fixed tests. added test for gitlab_ci_service model
2013-01-03 09:37:13 +02:00
e65731bb7e
Add concerns to autoload
2013-01-03 09:12:24 +02:00
40a956eb68
Few more fixes after removing roles
2013-01-03 00:01:08 +02:00
cac7723451
Get rid of roles
2013-01-02 23:35:11 +02:00
6c724ed96c
Fix factories
2013-01-02 21:31:48 +01:00
67896ea9a2
Fixed missing current user for issue observer
2013-01-02 20:25:25 +02:00
ccf0686b01
Fix api specs. Use id instead path
2013-01-02 19:46:06 +02:00
d431e43392
Fix few bugs and tests after refactoring ownership logic
2013-01-02 19:32:34 +02:00
00a1f5bc2c
Project has now correct owner and creator. Increased test coverage
2013-01-02 19:00:00 +02:00
ffe064a2c1
Bit of cleanup and improving mailer
2012-12-31 19:46:40 +02:00
c8ba5c2d58
Fix routing issues when navigating over tree, commits etc
2012-12-25 06:14:05 +03:00
db2c15369c
Merge branch 'master' into discussions
...
Conflicts:
app/assets/stylesheets/main.scss
app/models/project.rb
app/views/notes/_common_form.html.haml
app/views/notes/_per_line_form.html.haml
lib/gitlab/markdown.rb
spec/models/note_spec.rb
2012-12-23 01:03:57 +01:00
3ff131a747
Improve web hook data. Use clonable url in repo info
2012-12-23 01:10:57 +02:00
fa8f834374
Fix import rake task and tests
2012-12-23 00:15:48 +02:00
1ba28aaef8
Implement UsersProject project_access validation
2012-12-22 19:52:28 +02:00
2398af9ab0
Fixed wierd gitlab markdown issue
2012-12-22 14:18:40 +02:00
b510f8c496
Fixed tests
2012-12-21 13:37:44 +02:00
a567d596f8
Merge pull request #2305 from gitlabhq/fix_gfm_auto_complete
...
Fix and refactoring gfm_autocomplete
2012-12-21 02:47:55 -08:00
77d632890b
refactoring gfm_autocomplete
2012-12-20 20:52:12 +02:00
757c7a5291
Fix gravatar and ldap config
2012-12-20 16:54:28 +01:00
19eb637419
Update uses of Gitolite.config.foo settings
2012-12-20 16:54:28 +01:00
adb17d6052
Cleanup after issues refactor and fix test
2012-12-20 15:39:54 +02:00
2f7effe804
Refactor issues, Remove ajax
2012-12-19 06:14:05 +03:00
e954438a1d
Extended users API to support updating and deleting users.
...
Also added tests.
2012-12-18 21:24:31 +02:00
552c6d4598
Make tests green for postgres
2012-12-18 20:43:44 +02:00
9ada678819
Split commit_id and noteable_id for Note
2012-12-18 20:02:00 +02:00
592412992d
Account role spec
2012-12-16 18:27:16 +02:00
0f7d3f591c
Moving repositories spec to roles. Added missing spec for project
2012-12-15 12:32:09 +02:00
b79e00881e
Uncommented test observing comment event
2012-12-14 22:05:10 +02:00
0ff468160e
Fixed event.allowed? with event.proper?
2012-12-14 21:54:49 +02:00
b01f8b63c2
added NamespacedProject role. Extended project info displayed for admin. Fixed project limit
2012-12-14 08:14:05 +03:00
e228dae876
Fix spec/workers/post_receive_spec.rb
2012-12-13 19:20:37 +02:00
bca7bddd3d
Add ace editor to snippets
2012-12-12 19:42:08 +02:00
8918d11379
Fix project hook spec
2012-12-10 21:00:10 +01:00
20c8d6e644
Merge pull request #2222 from jojosch/add-test-help-raketasks
...
add help/raketasks to routing spec and search autocomplete
2012-12-10 05:38:14 -08:00
8a08fdcd32
Fix worker specs to parse namespaces
2012-12-09 10:34:46 +02:00
f8144bd377
add help/raketasks to routing spec
2012-12-08 11:42:38 +01:00
85db534afc
Merge pull request #2208 from jouve/username2
...
Allow proper use of @username in Git(lab|hub) Flavored Markdown.
2012-12-07 01:30:36 -08:00
045b4c8fcd
replace user.name by user.username in GFM
2012-12-07 04:46:29 +01:00
0aa7f79ca4
allow customize gravatar url
2012-12-07 00:44:22 +04:00
07e4a12a09
fix failing spec
2012-12-06 23:38:38 +04:00
a350b52c9b
Rewrite project security model tests
2012-12-05 17:06:15 +02:00
ae067ee322
Fix vote counting
2012-12-03 22:51:56 +01:00
05820516f1
Remove annoying failing spec
2012-12-03 17:38:35 +02:00
e117414e44
Merge pull request #2124 from NARKOZ/api
...
remove unnecessary API::VERSION constant
2012-12-02 03:30:30 -08:00
46bf3a0949
Refactored profile to resource. Added missing flash notice on successfull updated. Update username via ajax
2012-12-02 13:29:24 +02:00
270a43370a
API: get a single wall note
2012-12-01 02:20:45 -08:00
968c09ae91
API version returns last version set
...
* fixed in grape v0.2.2
2012-12-01 02:03:51 -08:00
10ec9b2293
Merge pull request #2017 from duksis/backup_restore
...
bugfix: backup data retrieved with the same type keys as saved
2012-11-30 12:48:27 -08:00
ee6187bd55
API: ability to create a wall note
2012-11-29 15:52:56 -08:00
c946bf886c
API: create new notes
2012-11-29 12:11:00 -08:00
1c5aa848ce
API: get a single note
2012-11-29 12:11:00 -08:00
01eab583d0
API: list wall, snippet and issue notes
2012-11-29 12:11:00 -08:00
eb1004f789
Refactor abilities. Added ProjectUpdate context. Fixed few bugs with namespaces
2012-11-29 12:39:03 +02:00
a0aa0212a9
Removed feature: comments on wiki
2012-11-29 06:14:05 +03:00
3d242a3154
Fix GitLab Markdown helper spec
2012-11-28 16:05:58 +01:00
f614ae8ef7
Increased test coverage
2012-11-21 07:14:05 +03:00
e9be4b375b
Cover ProjectMover with tests
2012-11-21 06:18:05 +03:00
47234ab367
Validate username. Gitlab::Regex added
2012-11-28 06:14:05 +03:00
a4e6ab0a29
Fixing and commenting tests
2012-11-26 14:44:29 +02:00
e750efd9fc
Merge pull request #2067 from riyad/diff-and-patch-for-commits-and-merge-requests
...
Diff and patch for commits and merge requests
2012-11-26 04:40:49 -08:00
1d7fdf45ff
Removed unused spec
2012-11-25 16:53:49 +02:00
c31d48dd25
Allow project creation in scope of group for non-admin but group owners
2012-11-25 11:57:01 +02:00
267b18dead
Add specs for exporting merge requests as diff or patch
2012-11-25 00:06:53 +01:00
2b1afa0e62
Remove merge_request#raw and replace it with formats to #show
...
Needed to add a constraint on the id. Otherwise the format was parsed as part of the id.
2012-11-25 00:05:44 +01:00
ddb7399ac4
Add specs for exporting commits as diff or patch
2012-11-25 00:05:11 +01:00
65c470e843
Reannotated
2012-11-24 22:16:51 +02:00
4023d9f852
class for moving project
2012-11-24 11:46:19 +02:00
0e1635a68a
Fixing requests after namespaces. Fixed admin bug with access to project
2012-11-23 22:25:28 +02:00
e92b563acf
Fix model tests
2012-11-23 20:53:24 +02:00
9304d049de
Fixed some tests and snippet colorize
2012-11-23 22:31:09 +03:00
470aa7675e
Fix project.code-related functionality
2012-11-23 21:31:09 +03:00
c50ec72b52
Deprecate code for Project. Use title and path
2012-11-23 21:11:09 +03:00
2b683b0d0b
Ability to create project with namespace
2012-11-23 07:11:09 +03:00
3b7c2adf0a
Add diff format to commit#show
2012-11-22 20:49:44 +01:00
71214bee75
Move directory with project. Fixed all related path methods to use namespace
2012-11-22 22:41:26 +03:00
4d846c09b1
Fixed spec
2012-11-20 23:18:44 +02:00
a9c2500a55
Stub for Dir.chdir as it is not needed
2012-11-20 16:34:58 +02:00
93fdc4ca9d
Reannotated
2012-11-20 14:19:55 +02:00
a8eb3fe1d2
tests for issue #1984
2012-11-19 22:42:58 +02:00
8500743464
Post Receive Refactored. Service hooks also triggered now
2012-11-19 21:44:05 +03:00
95c23b2f97
Annotated. schema updated
2012-11-19 21:24:05 +03:00
c3b074acab
Service model and service hook
2012-11-20 11:33:49 +02:00
ba25b2dc84
Use poltergeist instaead of capybara-webkit
2012-11-16 12:27:39 +02:00
578cf89812
Fix specs
2012-11-14 01:20:37 +01:00
b28ab8962b
Merge pull request #1928 from kouno/cleanup-factories
...
Remove backward compatibility of factories.
2012-11-13 08:45:03 -08:00
80fb38de7a
Remove backward compatibility of factories.
2012-11-13 22:27:45 +11:00
313595e171
Annotated
2012-11-07 17:32:39 +02:00
d6a5e3dad7
Merge pull request #1735 from NARKOZ/api
...
API fixes
2012-11-07 03:50:42 -08:00
3c5a3fe0ae
Merge branch 'front-end' of https://github.com/NARKOZ/gitlabhq into NARKOZ-front-end
...
Conflicts:
app/views/issues/_form.html.haml
2012-10-27 11:24:11 +03:00
cec97c2708
we dont show commit message on tags page any more
2012-10-26 22:10:17 +03:00
d005242d23
Merge pull request #1803 from gitlabhq/api_merge_request
...
Api for merge request
2012-10-25 03:49:31 -07:00
56bf829c75
API: fix after review
2012-10-25 13:19:18 +03:00
e6cdfb607a
API: tests for merge_requests
2012-10-25 13:13:01 +03:00
b7a9e41bd2
Handle perfomance issue with team import. Model specs
2012-10-24 14:52:17 +03:00
b1ef7d7a44
fix typo in spec
2012-10-19 03:41:09 -07:00
0369c74e58
fix wrong test case
2012-10-19 03:28:26 -07:00
2dc0f098fd
fix typos in specs
2012-10-19 03:25:39 -07:00
c610206321
fix mass-assignment error in user create API
2012-10-19 03:23:10 -07:00
413778b645
Rename NoteObserver methods and clarify things
2012-10-18 01:14:10 +02:00
db469ea3e6
Fixing broken test of project last_activity
2012-10-17 22:35:08 +03:00
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
e84d90c1e7
Merge pull request #1692 from riyad/saner-note-methods
...
Small Note code cleanup
2012-10-15 10:11:00 -07:00
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
b1461de993
Make Note methods saner
2012-10-13 16:23:12 +02:00
89a349f9a5
Merge pull request #1685 from jozefvaclavik/master
...
Hooks API (List one hook & edit)
2012-10-12 02:23:53 -07:00
96abbf02e3
Update spec/requests/api/projects_spec.rb
...
Fixed mistake with updating project hook
2012-10-12 11:30:39 +03:00
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
378fe076b6
Reduce complexity: replace case statement with method lookup.
2012-10-11 13:27:58 -04:00
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
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
6dc8c0eac2
Make MRs also count and display its commits' notes
2012-10-10 01:31:36 +02:00
eb92813757
Move emoji auto-complete helper to ApplicationHelper
2012-10-10 00:53:42 +02:00
bbd92e57cb
Add emoji_for_completion helper
2012-10-09 14:47:42 +02:00
41e53eb980
Annotated
2012-10-09 11:14:17 +03:00
a4cd738686
tests fix
2012-10-09 04:10:16 +04:00
61f12da3a5
API: add project snippets listing
2012-10-08 02:13:53 -07:00
74213534bc
Fix tests
2012-10-05 17:01:44 +03:00
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
3606a14889
ExtractsPath: Use ref_names instead of branches+tags
2012-10-04 14:13:52 -04:00
e25ddca0c4
Fix bug with branches whose name contains slash
2012-10-04 19:31:31 +03:00
9e80d2d4f7
Merge branch 'feature/groups' of dev.gitlabhq.com:gitlabhq
2012-10-03 12:17:48 +00:00
dc22dd8ade
Factories spec refactoring after #1616
2012-10-03 13:33:31 +03:00
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
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
d683ce5c10
refactored factory + fixed tests
2012-10-02 18:20:46 +03:00
fa3ae24ca7
Group entity. Group has many projects
2012-10-02 18:17:12 +03:00
c4883ca225
Update linguist and pygments #1602
2012-10-02 16:29:03 +03:00
bda0a75581
#1585 Api for user creation: rspec
2012-10-02 13:59:22 +03:00
db69836319
Move ProjectHooks from spec/requests to spinach
2012-09-27 23:52:08 +03:00
9cabe04368
tests for: Profile -> History
2012-09-27 23:23:11 +03:00
f064c84019
Add nav_link helper to TabHelper
2012-09-26 16:32:26 -04:00
aa0c4b77b6
Add current_action? helper
2012-09-26 16:32:26 -04:00
afc4a75499
Use Rails.root.join where appropriate
2012-09-26 16:32:26 -04:00
7df25e77ac
Speed up request specs a bit
2012-09-26 16:32:26 -04:00
2df3b310f9
Rename branches and tags Repo methods to branch_names and tag_names
2012-09-26 16:32:26 -04:00
5cea3e576d
Remove atom Dashboard spec that no longer applies
2012-09-26 16:32:26 -04:00
67fd743294
Clean up project access spec
2012-09-26 16:32:26 -04:00
cf237f1d32
Fix GFM request spec
2012-09-26 16:32:26 -04:00
9f0e80591a
Fix Repository role spec
2012-09-26 16:32:25 -04:00
1799cf3b49
Add CommitsController spec to make sure atom feeds work
2012-09-26 16:32:25 -04:00
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
6b90f36f5b
Updates to routing specs
2012-09-26 16:32:24 -04:00
60ac6a28a2
Allow current_controller? helper to take an Array of options
2012-09-26 16:32:24 -04:00
3ad931ca92
Add current_controller? helper method
...
Simplifies some of the "active tab" checks we're doing
2012-09-26 16:32:23 -04:00
f1c6bd8df3
Factories - Format project path and code
2012-09-26 16:32:23 -04:00
169f16fb32
Remove Commits#compare, add CompareController
2012-09-26 16:32:22 -04:00
a1e68a9120
Rename RefExtractor to ExtractsPath
...
Update docs a bit
2012-09-26 16:32:22 -04:00
a8ea8d98a4
Update RefExtractor to handle atom feeds
2012-09-26 16:32:22 -04:00
576cec6c67
Add BlobController, remove Refs#blob
2012-09-26 16:32:22 -04:00
39c6579306
Add BlameController, remove Refs#blame action
2012-09-26 16:32:22 -04:00
37f0b600bc
Another RefExtractor refactor
2012-09-26 16:32:22 -04:00
79a02df92e
Update usages of tree_file_project_ref_path to project_tree_path
2012-09-26 16:32:21 -04:00
e33cbb9b42
Add TreeController and spec
2012-09-26 16:32:21 -04:00
884eb73297
Enable tree resource, remove old tree routes
2012-09-26 16:32:21 -04:00
567767bcf2
Add ref_extractor helper module for upcoming controllers
2012-09-26 16:32:21 -04:00
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
bde5088525
Add routing specs for new routes
2012-09-26 16:32:20 -04:00
83efcabc82
set activerecord whitelist_attributes to true
2012-09-26 11:18:35 -07:00
965b6701ab
Comment removed
2012-09-26 17:01:13 +03:00
c09d233611
Merge branch 'master' into fix_project_access_notification
2012-09-26 16:14:47 +03:00
5928388b1c
Protect users projects_limit from mass assignment.
2012-09-26 13:20:44 +02:00
7284c58c5f
Don't test if invalid key is valid.
2012-09-25 16:13:24 +02:00
012dc2278c
Valid key for deploy keys spec test.
2012-09-25 16:13:13 +02:00
f3ce02b5c9
Reject ssh keys that break gitolite.
...
Failing test.
Working check.
2012-09-24 16:48:10 +02:00
1bae64d7f6
whitespace
2012-09-21 04:53:13 -07:00
b62445813d
API: SSH keys belong to user entity
2012-09-21 04:49:28 -07:00
4a072be2d7
API: commits belong to project repository
2012-09-21 04:34:07 -07:00
131553627d
Merge pull request #1521 from NARKOZ/api
...
API for project team members
2012-09-21 04:19:16 -07:00
25b745271a
add API for project team members
2012-09-21 03:23:17 -07:00
10d3a30b25
APi for commits. Better api docs
2012-09-21 13:22:30 +03:00
d12579aa43
Merge branch 'api' of https://github.com/NARKOZ/gitlabhq into api
2012-09-20 19:35:45 +03:00
a605943d76
fix broken spec
2012-09-20 22:11:15 +06:00
b08d33f6a9
API: return 401 for invalid session
2012-09-20 08:38:08 -07:00
9aafe77e70
I want be able to get token via api. Used for mobile applications
2012-09-20 17:45:07 +03:00
e6ce47291b
master merged
2012-09-20 10:25:29 +03:00
496f88afe1
Escape text passed to gfm by link_to_gfm
2012-09-19 19:42:26 -04:00
cb2be3ce0a
Don't email omniauth created users
2012-09-19 13:36:00 -05:00
01974185a1
Simplify is_within matcher
...
[ci skip]
2012-09-19 12:14:42 -04:00
b6c6a5b159
Merge branch 'master' into ssh_keys_api
2012-09-16 22:37:50 +03:00
f4b14494ef
Move project-related routing specs to their own file
2012-09-16 12:42:52 -04:00
87d40fd276
Docs added
2012-09-16 18:21:59 +03:00
c23eb40829
SSH Keys API implemented
2012-09-16 17:52:06 +03:00
02b24cefc7
Missed a use of team_project_path
2012-09-16 10:38:01 -04:00
95bd93fe1a
Remove Projects#team action
...
Uses TeamMembers#index instead, to be more RESTful
2012-09-16 10:07:06 -04:00
83f24de352
Add routing specs
2012-09-16 10:06:21 -04:00
a82977c648
A bit of test refactoring
2012-09-15 01:00:59 +03:00
dc37c8aaae
Refactored profile area
2012-09-14 19:13:25 +03:00
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
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
3643df1f7c
Merge pull request #1411 from miks/project_hooks_api
...
Project hooks API
2012-09-12 12:16:35 -07:00
6233fb6b5d
Merge pull request #1446 from NARKOZ/refactoring
...
specs DRY up
2012-09-12 09:08:42 -07:00
b6f249dc1f
make API specs more organized and readable
2012-09-12 05:11:56 -07:00
a87c268f7d
remove duplicate code from atom request specs
2012-09-12 05:01:50 -07:00
048d47e626
Refactorn oauth & ldap
2012-09-12 09:23:16 +03:00
40eec08c99
Merge pull request #1409 from riyad/update-votes
...
Update votes for issues and merge requests
2012-09-11 23:08:19 -07:00
Dmitriy Zaporozhets
Andrey Kumanyaev
Jun Futagawa
Valeriy Sizov
Marin Jankovski
Riyad Preukschas
Boyan Tabakov
Johannes Schleifenbaum
Ariejan de Vroom
Cyril
Sergey Linnik
Nihad Abbasov
Hugo Duksis
Hugo Duksis
Vincent Bonmalais
Dmitriy Zaporozhets
Robb Kidd
jozefvaclavik
Robert Speicher
Alex Denisov
Sytse Sijbrandij
Nihad Abbasov
Gabor Liptak