miks
|
2e76342d72
|
typo fixed
|
2012-09-08 12:37:23 +03:00 |
|
|
miks
|
4226458faf
|
Merge branch 'master' into project_users_api
|
2012-09-08 10:50:24 +03:00 |
|
Dmitriy Zaporozhets
|
7cc4b3f632
|
Merge pull request #1406 from riyad/markdown-code-fixes
Markdown code fixes
|
2012-09-07 21:19:31 -07:00 |
|
|
Dmitriy Zaporozhets
|
60ab3bea39
|
Merge pull request #1407 from riyad/add-emoji-docs
Add emoji docs
|
2012-09-07 21:17:42 -07:00 |
|
Riyad Preukschas
|
d661b893c5
|
Prevent gfm() to leak changes to the string supplied through the _text_ argument
|
2012-09-08 01:58:12 +02:00 |
|
|
Riyad Preukschas
|
ce3fb94939
|
Fix bug where parsing of emoji was unnecessarily dependent on @project being set
|
2012-09-08 01:11:44 +02:00 |
|
|
Riyad Preukschas
|
9a4c22d395
|
Remove unnecessary check in Markdown helper
|
2012-09-08 01:11:32 +02:00 |
|
|
Riyad Preukschas
|
f4a90bc9f3
|
Add emoji docs to Markdown help
|
2012-09-08 01:09:12 +02:00 |
|
|
Riyad Preukschas
|
130520fa5e
|
Reorder blocks in Markdown help
|
2012-09-08 01:09:09 +02:00 |
|
|
Riyad Preukschas
|
5348ee6278
|
Fix Ruby anti-pattern in Markdown
|
2012-09-07 22:14:17 +02:00 |
|
|
Dmitriy Zaporozhets
|
7b50a7c99d
|
Merge pull request #1402 from AlexDenisov/preselected_milestone_while_create_new_issue
Preselected milestone and assignee while create new issue
|
2012-09-07 11:10:27 -07:00 |
|
Alex Denisov
|
1b83af6eed
|
IssueController#new refactored
|
2012-09-07 20:59:12 +03:00 |
|
|
randx
|
367e17cc84
|
5xx error status code for gitolite & encoding error
|
2012-09-07 20:47:52 +03:00 |
|
|
randx
|
e8f39a0a61
|
gitolite -> more exceptions
|
2012-09-07 20:43:51 +03:00 |
|
|
randx
|
048117c05d
|
projects helper added
|
2012-09-07 19:57:13 +03:00 |
|
|
Alex Denisov
|
f789476241
|
Merge branch 'master' into preselected_milestone_while_create_new_issue
|
2012-09-07 17:20:20 +03:00 |
|
|
Alex Denisov
|
320250cd7b
|
Cucumber tag removed
|
2012-09-07 17:03:38 +03:00 |
|
|
Alex Denisov
|
b462b0c6eb
|
Pre-selected assignee implemented
|
2012-09-07 16:52:48 +03:00 |
|
|
Alex Denisov
|
c818c93aa7
|
Cucumber scenario on pre-selected assignee added
|
2012-09-07 16:51:37 +03:00 |
|
|
Alex Denisov
|
26552051b7
|
Pre-selected milestone implemented
|
2012-09-07 16:35:59 +03:00 |
|
|
randx
|
b994a65fc3
|
change gitolite backend behaviour to prevent error when config directory removed
|
2012-09-07 15:36:40 +03:00 |
|
|
Alex Denisov
|
09263719d5
|
Preselected Milestone: Cucumber scenario added
|
2012-09-07 13:56:13 +03:00 |
|
|
Dmitriy Zaporozhets
|
137594dd08
|
Merge pull request #1339 from chopmann/fix-import_bulk
fix bulk_import for #1309
|
2012-09-07 00:44:44 -07:00 |
|
|
Dmitriy Zaporozhets
|
fed6ab2481
|
Change representation of team members. Group by role
|
2012-09-07 10:42:41 +03:00 |
|
|
Alex Denisov
|
85db51f660
|
don't send notification when UsersProject destroyed
|
2012-09-07 10:23:45 +03:00 |
|
|
Dmitriy Zaporozhets
|
61c7449321
|
Bulk user add on project -> new team member
|
2012-09-07 09:50:35 +03:00 |
|
|
Alex Denisov
|
ed4fbcf6b0
|
Merge branch 'master' into fix_project_access_notification
|
2012-09-07 09:39:34 +03:00 |
|
|
randx
|
5cb9e7eedc
|
Fix emojii
|
2012-09-07 09:16:04 +03:00 |
|
|
Dmitriy Zaporozhets
|
963746f978
|
Refactor gitolite_config
|
2012-09-07 09:15:30 +03:00 |
|
|
Dmitriy Zaporozhets
|
4f8a4aa44c
|
Merge pull request #1384 from tsigo/emoji
Emoji!
|
2012-09-06 23:05:18 -07:00 |
|
|
Dmitriy Zaporozhets
|
7c0a1068bf
|
Merge pull request #1363 from AlexDenisov/api_create_project_fixes
API create project fixes
|
2012-09-06 23:00:04 -07:00 |
|
|
Dmitriy Zaporozhets
|
687dc0dc58
|
Merge pull request #1385 from dosire/ignore_chef_dir
Ignore chef dir.
|
2012-09-06 22:58:10 -07:00 |
|
|
Dmitriy Zaporozhets
|
805d408f0f
|
Merge pull request #1397 from tsigo/fix_markdown_help
Fix Markdown help page
|
2012-09-06 22:48:00 -07:00 |
|
|
Dmitriy Zaporozhets
|
79021e674b
|
Split gitolite backend. Use gitolite_config methods moved to separate class
|
2012-09-07 08:16:29 +03:00 |
|
Nihad Abbasov
|
0eb8a03981
|
add mysql service for travis-ci
see http://about.travis-ci.org/blog/august-2012-upcoming-ci-environment-updates
|
2012-09-07 07:01:04 +06:00 |
|
Robert Speicher
|
8fdeb43c36
|
Fix Help/Markdown: Take 2
|
2012-09-06 17:20:57 -04:00 |
|
|
Robert Speicher
|
34a48d55cc
|
Revert "Change @project instance variable to a local in views/help/markdown"
This reverts commit 6471d8c652.
|
2012-09-06 17:17:56 -04:00 |
|
|
Robert Speicher
|
8f3b1d6ea4
|
Fix spec broken by bde19c0
|
2012-09-06 17:05:23 -04:00 |
|
|
Robert Speicher
|
bde19c061a
|
Update failure message for UsersProject uniqueness validation
Was "User has already been taken", is now "User already exists in
project".
|
2012-09-06 16:51:28 -04:00 |
|
|
miks
|
909c8c345d
|
Make project users API more RESTful
|
2012-09-06 23:49:29 +03:00 |
|
|
miks
|
2dc0519277
|
bulk access roles update/deletion added
|
2012-09-06 23:14:42 +03:00 |
|
|
Robert Speicher
|
2faa4bba40
|
Update Note#upvote? to support emoji voting
|
2012-09-06 15:31:25 -04:00 |
|
|
Robert Speicher
|
3a63f6f316
|
Simplify EMOJI_PATTERN
|
2012-09-06 15:26:55 -04:00 |
|
|
Robert Speicher
|
8808c5fa8d
|
Merge branch 'master' into emoji
|
2012-09-06 15:23:42 -04:00 |
|
|
Dmitriy Zaporozhets
|
a595f8944a
|
Merge pull request #1392 from NARKOZ/refactoring
refactor factory specs
|
2012-09-06 08:11:41 -07:00 |
|
Nihad Abbasov
|
46b9aafc39
|
add missing selector to projects.js
|
2012-09-06 07:56:33 -07:00 |
|
|
Nihad Abbasov
|
d861023cb9
|
refactor factory specs
|
2012-09-06 07:52:01 -07:00 |
|
Dmitriy Zaporozhets
|
b299385e15
|
Merge branch 'AlexDenisov-normalize_capitalization'
|
2012-09-06 17:46:57 +03:00 |
|
|
Dmitriy Zaporozhets
|
b57620e23b
|
Merge branch 'normalize_capitalization' of https://github.com/AlexDenisov/gitlabhq into AlexDenisov-normalize_capitalization
|
2012-09-06 17:36:04 +03:00 |
|
|
miks
|
3d3c6674fb
|
Typo fixed
|
2012-09-06 16:32:26 +03:00 |
|