Dmitriy Zaporozhets
c918000bc2
Merge pull request #3396 from Andrew8xx8/issue-button-fix
...
New issue button was not follows to external tracker if it is selected. ...
2013-03-30 15:10:08 -07:00
Dmitriy Zaporozhets
1c5a393c95
Merge pull request #3406 from docwhat/in_projects
...
Fixed UsersProject.in_projects
2013-03-30 15:03:44 -07:00
Dmitriy Zaporozhets
21191318ae
refactor wall.js. style wall page a bit
2013-03-28 16:41:29 +02:00
Dmitriy Zaporozhets
70947fedda
inslude author & assignee to note notification recipients
2013-03-28 14:51:25 +02:00
Dmitriy Zaporozhets
618249734b
rebuild notification on notes logic
2013-03-28 14:39:59 +02:00
Dmitriy Zaporozhets
63e6f055f1
Fix notify specs. Fix merge request close via api
2013-03-28 13:24:01 +02:00
Dmitriy Zaporozhets
c04120c1c5
Improve notification service tests
2013-03-28 12:24:04 +02:00
Dmitriy Zaporozhets
f49a2ac0df
Add close issue/mr methods to Notify. Refactored Notificationservice
2013-03-28 12:14:53 +02:00
Dmitriy Zaporozhets
9e616459e0
add watchers to email recipients list. Add emails for close/merge MR
2013-03-28 11:59:06 +02:00
Dmitriy Zaporozhets
ba59912072
Prepare UI for notification settings
2013-03-27 20:07:52 +02:00
Dmitriy Zaporozhets
d55ade1686
notification scaffold
2013-03-27 19:04:29 +02:00
Dmitriy Zaporozhets
5f14a6bcf8
annotated
2013-03-27 18:26:37 +02:00
Dmitriy Zaporozhets
e3f1164248
stub notification in event model
2013-03-26 19:27:39 +02:00
Dmitriy Zaporozhets
3728c4904e
refactor observers test since email logic moved to service
2013-03-26 19:00:54 +02:00
Dmitriy Zaporozhets
38ffb8220c
use NotificationService for handle notify logic when MR created
2013-03-26 17:16:06 +02:00
Christian Höltje
b8502cbaee
Fixed UsersProject.in_projects
...
I discovered while trying to use UserTeam#remove_member() that
UsersProject.in_projects was broken. So I wrote test cases to test what
I was trying to do and fixed the underlying problem.
2013-03-26 10:19:55 -04:00
Dmitriy Zaporozhets
58a1ed6dd3
Merge pull request #3398 from Andrew8xx8/spork
...
Spork support added
2013-03-26 06:44:52 -07:00
Dmitriy Zaporozhets
da1cf5b9e7
enable callbacks for specs after notification
2013-03-26 15:16:06 +02:00
Dmitriy Zaporozhets
c7bd99b040
refactor issue observer spec
2013-03-26 14:41:57 +02:00
Andrew8xx8
5949e30243
Spork support added
2013-03-26 13:38:42 +04:00
Dmitriy Zaporozhets
e3e8b9fcb9
fixed tests
2013-03-26 11:17:49 +02:00
Dmitriy Zaporozhets
cf6d4dc10c
NotificationService for resolving email notification logic
2013-03-26 10:48:06 +02:00
Andrew8xx8
242f6aa218
New issue button was not follows to external tracker if it is selected. fixed #3386
2013-03-26 12:28:26 +04:00
Dmitriy Zaporozhets
9d92433a7c
login with both email or username
2013-03-25 16:10:14 +02:00
Dmitriy Zaporozhets
d6ac38133c
Admin.projects: remove views and route specs
2013-03-25 14:58:43 +02:00
Dmitriy Zaporozhets
98bea4b1ff
Updatev security tests since admin is a superuser now. Has access to any project
2013-03-25 13:40:08 +02:00
Dmitriy Zaporozhets
c610347cc1
Removed not relevant tests for admin.projects
2013-03-25 13:36:08 +02:00
Dmitriy Zaporozhets
b6641d6932
Merge branch 'fix-404-json-file' of https://github.com/hiroponz/gitlabhq into hiroponz-fix-404-json-file
2013-03-24 11:26:57 +02:00
Dmitriy Zaporozhets
c4299bb45a
Move directory logic out of model. Use Gitlab:Shell class to interact with file system
2013-03-21 22:11:08 +02:00
Dmitriy Zaporozhets
d6338a8482
Merge pull request #3258 from hiroponz/display-commit-msg
...
Display commit message on network graph.
2013-03-21 09:58:57 -07:00
Sato Hiroyuki
06c5389780
Fix travis failure randomly, because Capybara.default_wait_time is too short.
2013-03-21 15:24:06 +00:00
Sato Hiroyuki
a1fe375e44
Fix 404 error while displaying json files.
...
It uses params[:id] instead of request.fullpath.
It should fix #3132 .
2013-03-21 15:10:14 +00:00
Dmitriy Zaporozhets
3d9bd6e3e7
fix gfm helper test
2013-03-20 13:41:18 +02:00
Dmitriy Zaporozhets
51b1859e49
fix key observer test
2013-03-20 10:25:11 +02:00
Dmitriy Zaporozhets
a3cdaeef66
refactor emails a bit. Add email on ssh key creation
2013-03-19 20:00:41 +02:00
Dmitriy Zaporozhets
2465a4fdb2
removed few outdated tests
2013-03-19 15:37:11 +02:00
Dmitriy Zaporozhets
063c4a069c
fix wall feature. removed duplicated test
2013-03-19 14:58:58 +02:00
Dmitriy Zaporozhets
b1bd3f1252
fix tests. added jquery.timeago.js
2013-03-19 14:39:32 +02:00
Dmitriy Zaporozhets
fb1c85061e
remove unused spec
2013-03-19 08:40:32 +02:00
Dmitriy Zaporozhets
306ea84e85
Merge pull request #3251 from AlexDenisov/api_additional_user_fields
...
Abilities added to /user and /sign_in requests
2013-03-18 23:20:11 -07:00
Sato Hiroyuki
92de0faf6e
Fix spec errors.
2013-03-19 14:21:00 +09:00
Alex Denisov
28e7d1a8bf
Abilities added to /user and /sign_in requests
2013-03-18 20:11:28 +00:00
Kevin Lyda
415bade302
Result of misspellings run.
...
Most of these are comments but a few are strings for users.
Might be an idea to run this from time to time:
https://github.com/lyda/misspell-check
It runs mostly clean now.
2013-03-17 19:46:54 +00:00
Dan Knox
330fe4162e
Fix Wiki migration task and add more test coverage.
...
There was an error in the #extract_attributes_from_page method that
caused an exception when checking to see if a page named "Home"
already exists.
The check occurs to handle the renaming of the main index page to
"Home" to match the Gollum standard. If there is already a page
called "Home" then the migrator will leave that page and create
the Index page as usual. Users will need to manually rename their
old "Home" page to something else then rename their "Index" page
to "Home". Fortunately, I would be highly surprised if this case
ever comes up.
I also added more verbosity to the logging so if an error does
occur, it will be easier to track down which Wiki page is causing
the problem.
2013-03-16 18:01:48 -07:00
Dmitriy Zaporozhets
71ab011a17
Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis
...
Conflicts:
app/views/layouts/project_resource.html.haml
app/views/wikis/edit.html.haml
app/views/wikis/pages.html.haml
app/views/wikis/show.html.haml
spec/features/gitlab_flavored_markdown_spec.rb
2013-03-15 16:55:07 +02:00
Dmitriy Zaporozhets
21b1fee92c
reannotated
2013-03-15 15:16:02 +02:00
Dmitriy Zaporozhets
35ad4fe7db
Use wiki tab for wiki, wall, snippets
2013-03-15 14:20:03 +02:00
Dmitriy Zaporozhets
ef05423f47
Finish select2-ajax for users. Added Select2Helper for tests
2013-03-14 10:16:27 +02:00
Dan Knox
7665b1de7e
Use Gitlab Markdown for Markdown files and Gollum to render the rest.
...
This commit enables the usage of the Gitlab Markdown post processing
on all Markdown formatted files. For file types that do not contain
Markdown, it defaults to the Gollum native renderer to process the
content.
2013-03-13 23:31:08 -07:00
Dmitriy Zaporozhets
366bc32013
stub git shell mv_repository
2013-03-12 18:59:25 +02:00
