Riyad Preukschas
|
f8e1f4a7c9
|
Replace commit note request specs with spinach features
|
2013-01-15 00:52:55 +01:00 |
|
|
Riyad Preukschas
|
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 |
|
|
Riyad Preukschas
|
8ee5fce9d6
|
Add preliminary specs for notes on merge requests
|
2013-01-15 00:27:59 +01:00 |
|
|
Riyad Preukschas
|
74e48f070f
|
Smaller fixes
|
2013-01-15 00:27:26 +01:00 |
|
Dmitriy Zaporozhets
|
9773ccc451
|
sidekiq with green tests
|
2013-01-09 09:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
2f6603e581
|
A bit of spinach tests
|
2013-01-09 08:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
31e3dc600a
|
Fix routing specs
|
2013-01-09 09:47:25 +02:00 |
|
|
Dmitriy Zaporozhets
|
92a619ad28
|
organize simplecov
|
2013-01-07 22:23:13 +02:00 |
|
|
Riyad Preukschas
|
8c604c9d31
|
Add specs for notes on wall
|
2013-01-05 22:58:36 +01:00 |
|
|
Riyad Preukschas
|
1883e0830c
|
Add specs for notes on commits
|
2013-01-05 22:58:27 +01:00 |
|
|
Dmitriy Zaporozhets
|
5a214ee6f1
|
Remove unused methods
|
2013-01-05 13:11:15 +02:00 |
|
|
Dmitriy Zaporozhets
|
e3d7ce2cc4
|
Tests are fixed now
|
2013-01-05 12:12:02 +02:00 |
|
|
Dmitriy Zaporozhets
|
de6fa5dd52
|
Fix security spec
|
2013-01-05 00:49:43 +02:00 |
|
|
Dmitriy Zaporozhets
|
9a88e4d184
|
Fix some tests. Use travis-ci 1.9.2
|
2013-01-05 00:43:32 +02:00 |
|
|
Dmitriy Zaporozhets
|
e16cebac3e
|
Fixed styles, ProjectHook specs etc
|
2013-01-05 00:35:38 +02:00 |
|
|
Dmitriy Zaporozhets
|
c6298678f5
|
use ui-box as for all
|
2013-01-04 23:35:31 +02:00 |
|
|
Dmitriy Zaporozhets
|
ef5b36eaaf
|
Fixed protected branches and file edit
|
2013-01-04 21:45:30 +02:00 |
|
|
Dmitriy Zaporozhets
|
afbdbb0c95
|
Rspec fixes
|
2013-01-04 18:50:31 +02:00 |
|
|
Dmitriy Zaporozhets
|
dccd8b6eaa
|
Continue refactoring. Use repostory and team
|
2013-01-04 08:43:25 +02:00 |
|
|
Dmitriy Zaporozhets
|
39ba934c0a
|
REpostiry, Team models
|
2013-01-03 21:09:18 +02:00 |
|
|
Dmitriy Zaporozhets
|
e6c0673ef1
|
Rspec models Milestone, Commit, UsersProject
|
2013-01-03 19:11:14 +02:00 |
|
|
Dmitriy Zaporozhets
|
2095780f24
|
fix tests
|
2013-01-03 12:37:12 +02:00 |
|
|
Dmitriy Zaporozhets
|
d6036f08aa
|
move activated? method to service
|
2013-01-03 09:52:14 +02:00 |
|
|
Dmitriy Zaporozhets
|
ce84e3f440
|
Fixed tests. added test for gitlab_ci_service model
|
2013-01-03 09:37:13 +02:00 |
|
|
Dmitriy Zaporozhets
|
e65731bb7e
|
Add concerns to autoload
|
2013-01-03 09:12:24 +02:00 |
|
|
Dmitriy Zaporozhets
|
40a956eb68
|
Few more fixes after removing roles
|
2013-01-03 00:01:08 +02:00 |
|
|
Dmitriy Zaporozhets
|
cac7723451
|
Get rid of roles
|
2013-01-02 23:35:11 +02:00 |
|
|
Riyad Preukschas
|
6c724ed96c
|
Fix factories
|
2013-01-02 21:31:48 +01:00 |
|
|
Dmitriy Zaporozhets
|
67896ea9a2
|
Fixed missing current user for issue observer
|
2013-01-02 20:25:25 +02:00 |
|
|
Dmitriy Zaporozhets
|
ccf0686b01
|
Fix api specs. Use id instead path
|
2013-01-02 19:46:06 +02:00 |
|
|
Dmitriy Zaporozhets
|
d431e43392
|
Fix few bugs and tests after refactoring ownership logic
|
2013-01-02 19:32:34 +02:00 |
|
|
Dmitriy Zaporozhets
|
00a1f5bc2c
|
Project has now correct owner and creator. Increased test coverage
|
2013-01-02 19:00:00 +02:00 |
|
|
Dmitriy Zaporozhets
|
ffe064a2c1
|
Bit of cleanup and improving mailer
|
2012-12-31 19:46:40 +02:00 |
|
|
Dmitriy Zaporozhets
|
c8ba5c2d58
|
Fix routing issues when navigating over tree, commits etc
|
2012-12-25 06:14:05 +03:00 |
|
|
Riyad Preukschas
|
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 |
|
|
Dmitriy Zaporozhets
|
3ff131a747
|
Improve web hook data. Use clonable url in repo info
|
2012-12-23 01:10:57 +02:00 |
|
|
Dmitriy Zaporozhets
|
fa8f834374
|
Fix import rake task and tests
|
2012-12-23 00:15:48 +02:00 |
|
|
Dmitriy Zaporozhets
|
1ba28aaef8
|
Implement UsersProject project_access validation
|
2012-12-22 19:52:28 +02:00 |
|
|
Dmitriy Zaporozhets
|
2398af9ab0
|
Fixed wierd gitlab markdown issue
|
2012-12-22 14:18:40 +02:00 |
|
|
Dmitriy Zaporozhets
|
b510f8c496
|
Fixed tests
|
2012-12-21 13:37:44 +02:00 |
|
|
Dmitriy Zaporozhets
|
a567d596f8
|
Merge pull request #2305 from gitlabhq/fix_gfm_auto_complete
Fix and refactoring gfm_autocomplete
|
2012-12-21 02:47:55 -08:00 |
|
Valeriy Sizov
|
77d632890b
|
refactoring gfm_autocomplete
|
2012-12-20 20:52:12 +02:00 |
|
|
Riyad Preukschas
|
757c7a5291
|
Fix gravatar and ldap config
|
2012-12-20 16:54:28 +01:00 |
|
|
Riyad Preukschas
|
19eb637419
|
Update uses of Gitolite.config.foo settings
|
2012-12-20 16:54:28 +01:00 |
|
|
Dmitriy Zaporozhets
|
adb17d6052
|
Cleanup after issues refactor and fix test
|
2012-12-20 15:39:54 +02:00 |
|
|
Dmitriy Zaporozhets
|
2f7effe804
|
Refactor issues, Remove ajax
|
2012-12-19 06:14:05 +03:00 |
|
Boyan Tabakov
|
e954438a1d
|
Extended users API to support updating and deleting users.
Also added tests.
|
2012-12-18 21:24:31 +02:00 |
|
|
Dmitriy Zaporozhets
|
552c6d4598
|
Make tests green for postgres
|
2012-12-18 20:43:44 +02:00 |
|
|
Dmitriy Zaporozhets
|
9ada678819
|
Split commit_id and noteable_id for Note
|
2012-12-18 20:02:00 +02:00 |
|
|
Dmitriy Zaporozhets
|
592412992d
|
Account role spec
|
2012-12-16 18:27:16 +02:00 |
|
|
Dmitriy Zaporozhets
|
0f7d3f591c
|
Moving repositories spec to roles. Added missing spec for project
|
2012-12-15 12:32:09 +02:00 |
|
|
Dmitriy Zaporozhets
|
b79e00881e
|
Uncommented test observing comment event
|
2012-12-14 22:05:10 +02:00 |
|
|
Dmitriy Zaporozhets
|
0ff468160e
|
Fixed event.allowed? with event.proper?
|
2012-12-14 21:54:49 +02:00 |
|
|
Dmitriy Zaporozhets
|
b01f8b63c2
|
added NamespacedProject role. Extended project info displayed for admin. Fixed project limit
|
2012-12-14 08:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
e228dae876
|
Fix spec/workers/post_receive_spec.rb
|
2012-12-13 19:20:37 +02:00 |
|
|
Dmitriy Zaporozhets
|
bca7bddd3d
|
Add ace editor to snippets
|
2012-12-12 19:42:08 +02:00 |
|
|
Riyad Preukschas
|
8918d11379
|
Fix project hook spec
|
2012-12-10 21:00:10 +01:00 |
|
|
Riyad Preukschas
|
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 |
|
|
Dmitriy Zaporozhets
|
8a08fdcd32
|
Fix worker specs to parse namespaces
|
2012-12-09 10:34:46 +02:00 |
|
Johannes Schleifenbaum
|
f8144bd377
|
add help/raketasks to routing spec
|
2012-12-08 11:42:38 +01:00 |
|
Ariejan de Vroom
|
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 |
|
Cyril
|
045b4c8fcd
|
replace user.name by user.username in GFM
|
2012-12-07 04:46:29 +01:00 |
|
Sergey Linnik
|
0aa7f79ca4
|
allow customize gravatar url
|
2012-12-07 00:44:22 +04:00 |
|
|
Sergey Linnik
|
07e4a12a09
|
fix failing spec
|
2012-12-06 23:38:38 +04:00 |
|
|
Dmitriy Zaporozhets
|
a350b52c9b
|
Rewrite project security model tests
|
2012-12-05 17:06:15 +02:00 |
|
|
Riyad Preukschas
|
ae067ee322
|
Fix vote counting
|
2012-12-03 22:51:56 +01:00 |
|
|
Dmitriy Zaporozhets
|
05820516f1
|
Remove annoying failing spec
|
2012-12-03 17:38:35 +02:00 |
|
|
Dmitriy Zaporozhets
|
e117414e44
|
Merge pull request #2124 from NARKOZ/api
remove unnecessary API::VERSION constant
|
2012-12-02 03:30:30 -08:00 |
|
|
Dmitriy Zaporozhets
|
46bf3a0949
|
Refactored profile to resource. Added missing flash notice on successfull updated. Update username via ajax
|
2012-12-02 13:29:24 +02:00 |
|
Nihad Abbasov
|
270a43370a
|
API: get a single wall note
|
2012-12-01 02:20:45 -08:00 |
|
|
Nihad Abbasov
|
968c09ae91
|
API version returns last version set
* fixed in grape v0.2.2
|
2012-12-01 02:03:51 -08:00 |
|
|
Dmitriy Zaporozhets
|
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 |
|
|
Nihad Abbasov
|
ee6187bd55
|
API: ability to create a wall note
|
2012-11-29 15:52:56 -08:00 |
|
|
Nihad Abbasov
|
c946bf886c
|
API: create new notes
|
2012-11-29 12:11:00 -08:00 |
|
|
Nihad Abbasov
|
1c5aa848ce
|
API: get a single note
|
2012-11-29 12:11:00 -08:00 |
|
|
Nihad Abbasov
|
01eab583d0
|
API: list wall, snippet and issue notes
|
2012-11-29 12:11:00 -08:00 |
|
|
Dmitriy Zaporozhets
|
eb1004f789
|
Refactor abilities. Added ProjectUpdate context. Fixed few bugs with namespaces
|
2012-11-29 12:39:03 +02:00 |
|
|
Dmitriy Zaporozhets
|
a0aa0212a9
|
Removed feature: comments on wiki
|
2012-11-29 06:14:05 +03:00 |
|
|
Riyad Preukschas
|
3d242a3154
|
Fix GitLab Markdown helper spec
|
2012-11-28 16:05:58 +01:00 |
|
|
Dmitriy Zaporozhets
|
f614ae8ef7
|
Increased test coverage
|
2012-11-21 07:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
e9be4b375b
|
Cover ProjectMover with tests
|
2012-11-21 06:18:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
47234ab367
|
Validate username. Gitlab::Regex added
|
2012-11-28 06:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
a4e6ab0a29
|
Fixing and commenting tests
|
2012-11-26 14:44:29 +02:00 |
|
|
Dmitriy Zaporozhets
|
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 |
|
|
Dmitriy Zaporozhets
|
1d7fdf45ff
|
Removed unused spec
|
2012-11-25 16:53:49 +02:00 |
|
|
Dmitriy Zaporozhets
|
c31d48dd25
|
Allow project creation in scope of group for non-admin but group owners
|
2012-11-25 11:57:01 +02:00 |
|
|
Riyad Preukschas
|
267b18dead
|
Add specs for exporting merge requests as diff or patch
|
2012-11-25 00:06:53 +01:00 |
|
|
Riyad Preukschas
|
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 |
|
|
Riyad Preukschas
|
ddb7399ac4
|
Add specs for exporting commits as diff or patch
|
2012-11-25 00:05:11 +01:00 |
|
|
Dmitriy Zaporozhets
|
65c470e843
|
Reannotated
|
2012-11-24 22:16:51 +02:00 |
|
|
Dmitriy Zaporozhets
|
4023d9f852
|
class for moving project
|
2012-11-24 11:46:19 +02:00 |
|
|
Dmitriy Zaporozhets
|
0e1635a68a
|
Fixing requests after namespaces. Fixed admin bug with access to project
|
2012-11-23 22:25:28 +02:00 |
|
|
Dmitriy Zaporozhets
|
e92b563acf
|
Fix model tests
|
2012-11-23 20:53:24 +02:00 |
|
|
Dmitriy Zaporozhets
|
9304d049de
|
Fixed some tests and snippet colorize
|
2012-11-23 22:31:09 +03:00 |
|
|
Dmitriy Zaporozhets
|
470aa7675e
|
Fix project.code-related functionality
|
2012-11-23 21:31:09 +03:00 |
|
|
Dmitriy Zaporozhets
|
c50ec72b52
|
Deprecate code for Project. Use title and path
|
2012-11-23 21:11:09 +03:00 |
|
|
Dmitriy Zaporozhets
|
2b683b0d0b
|
Ability to create project with namespace
|
2012-11-23 07:11:09 +03:00 |
|
|
Riyad Preukschas
|
3b7c2adf0a
|
Add diff format to commit#show
|
2012-11-22 20:49:44 +01:00 |
|
|
Dmitriy Zaporozhets
|
71214bee75
|
Move directory with project. Fixed all related path methods to use namespace
|
2012-11-22 22:41:26 +03:00 |
|
|
Dmitriy Zaporozhets
|
4d846c09b1
|
Fixed spec
|
2012-11-20 23:18:44 +02:00 |
|