home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 10:36:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marin Jankovski 70776c71b0 Merge branch 'remove-annoying-i18n-deprecation' into 'master' 
Remove annoying i18n deprecation

Thanks to this guy http://stackoverflow.com/a/20381730

Fixes #527

See merge request !197
 2014-10-07 09:19:43 +00:00
Dmitriy Zaporozhets 7bcd6f79a4 Merge pull request #7963 from cirosantilli/factor-previewable 
Factor markup? || gitlab_markdown? into new method
 2014-10-07 12:19:28 +03:00
Valery Sizov fd8d1d9b62 Snippets: rename public to internal 2014-10-07 11:54:00 +03:00
Ciro Santilli f4efb19038 Add tests for tree edit routes 
Critical because of possible confusion between /:id/preview
and /:id for a path that ends in preview.
 2014-10-07 10:04:09 +02:00
Vinnie Okada 0084b8a776 Display renamed files in diff views 
Show both the old and new filenames when viewing the diff for a renamed
file.
 2014-10-06 21:42:07 -05:00
Vinnie Okada 40263a06c1 Refactor task list tests and coffeescript 2014-10-06 19:19:12 -05:00
Robert Schilling d790b2cbb8 Merge pull request #7975 from bbodenmiller/patch-4 
webbrowsers -> web browsers
 2014-10-06 19:31:15 +02:00
Robert Schilling 9f3e763358 Merge pull request #7974 from bbodenmiller/patch-2 
number formatting fix
 2014-10-06 19:30:35 +02:00
Ben Bodenmiller 2aa2d268fd support latest firefox esr release 2014-10-06 09:30:25 -07:00
Ben Bodenmiller 014eeb2e0b webbrowsers -> web browsers 2014-10-06 09:27:38 -07:00
Ben Bodenmiller 897d69d6d5 number formatting fix 2014-10-06 09:26:40 -07:00
Dmitriy Zaporozhets 70004f4ef6 Merge branch 'slack_integration' into 'master' 
Slack integration

See merge request !1151
 2014-10-06 16:14:48 +00:00
Marin Jankovski 0fed1b5876 Merge pull request #7964 from mr-vinn/task-lists 
Add task lists to issues and merge requests
 2014-10-06 17:29:06 +02:00
Marin Jankovski eceef546d1 Add slack service migration. 2014-10-06 16:50:24 +02:00
Dmitriy Zaporozhets 0c291f35f5 Merge branch 'raise-on-forgery' into 'master' 
Raise on forgery

Fixes #1572

See merge request !1156
 2014-10-06 14:36:07 +00:00
Marin Jankovski 9535ce2caa Preventing some duplication in MR feature tests by adding a different comment. 2014-10-06 16:09:22 +02:00
Dmitriy Zaporozhets f815115de6 Protect from forgery with exception 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-06 16:18:25 +03:00
Dmitriy Zaporozhets 270efdf221 Merge branch 'improve-autolink' into 'master' 
Improve autolink

Fixes #1649

See merge request !1155
 2014-10-06 13:04:18 +00:00
Dmitriy Zaporozhets 4837771117 Merge branch 'fix-exception-sidekiq' into 'master' 
Prevent PG::Error exception

Prevent PG::Error exception when check commit reference on commit

Fix #1646

See merge request !1154
 2014-10-06 13:03:22 +00:00
Tobias Bieniek ca840e8769 fonts: Added "DejaVu Sans Mono" and "Ubuntu Mono" 
Everything is better than "Courier New" ...
 2014-10-06 12:28:10 +00:00
Dmitriy Zaporozhets 299114948b Use only escaped auto_link 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-06 15:15:39 +03:00
Dmitriy Zaporozhets 46b7a3f8f5 Prevent PG::Error exception when check commit reference on commit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-06 15:07:36 +03:00
Dmitriy Zaporozhets 90c96d1dc0 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-06 14:30:35 +03:00
Dmitriy Zaporozhets 0cdc2a85c1 Merge branch 'gitlab_git_bummp' into 'master' 
Gitlab git bump

Fixes #1643

See merge request !1153
 2014-10-06 11:30:17 +00:00
Marin Jankovski 1db8d3104c Add missing comma. 2014-10-06 11:51:15 +02:00
Dmitriy Zaporozhets ce3fb02ea0 Bump gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-06 12:27:13 +03:00
Dmitriy Zaporozhets 274e7951f6 Merge pull request #7379 from cirosantilli/remove-title 
[minor-refactor] Remove unused title parameter on merge request creation helper.
 2014-10-06 11:55:43 +03:00
Marin Jankovski 1e7e1d52b1 Changes to slack service structure added to changelog. 2014-10-06 10:45:17 +02:00
Marin Jankovski e5998adc26 Accommodate new webhook url format. 2014-10-06 10:44:01 +02:00
Marin Jankovski 216fb6ee07 Fix slack service speck. 2014-10-06 10:44:01 +02:00
Marin Jankovski 2017977214 Use only webhook for slack service integration. 2014-10-06 10:44:01 +02:00
Marin Jankovski 86d5a63e5e Fix failing api specs. 2014-10-06 10:19:11 +02:00
Vinnie Okada 31bc42de57 Add Spinach tests for task lists 2014-10-06 02:07:03 -05:00
Vinnie Okada 3a3b2eb33e Update docs for task lists 2014-10-05 22:15:36 -05:00
Vinnie Okada fecd9c0cb2 Add specs for tasks 
Add tests for the new task list functionality in the Markdown parser and
in issues and merge requests.
 2014-10-05 22:15:36 -05:00
Vinnie Okada 9f0083a96c Add task lists to issues and merge requests 
Make the Markdown parser recognize "[x]" or "[ ]" at the beginning of a
list item and turn it into a checkbox input.  Users who can modify the
issue or MR can toggle the checkboxes directly or edit the Markdown to
manage the tasks.  Task status is also displayed in the MR and issue
lists.
 2014-10-05 22:15:27 -05:00
Robert Schilling ff43500024 Merge pull request #7940 from cirosantilli/uniform-spinach-names 
Make Spinach test names consistent [failure unrelated]
 2014-10-06 00:48:00 +02:00
Ciro Santilli 9bebacd692 Dry admin logs. 2014-10-06 00:14:46 +02:00
Marin Jankovski bb929c2117 Merge pull request #7933 from mr-vinn/cross-project-markdown 
Implement cross-project Markdown references
 2014-10-05 21:04:16 +02:00
Kirill Zaitsev 11848febd1 Add issueable actor 2014-10-05 20:41:33 +04:00
Ciro Santilli fa34901237 Make Spinach test names consistent 
- do not add Feature to feature titles
- titleize feature titles
- put steps on the same path as .feature files
- make feature titles match their path
 2014-10-05 18:21:11 +02:00
Robert Schilling 43be3fcb83 Merge pull request #7960 from Soullivaneuh/fa-fix 
Fix fa-download icon
 2014-10-05 17:58:44 +02:00
Vinnie Okada 8dce0cd215 Fix cross-project reference test 
Test for the correct link text in cross-project references.
 2014-10-05 10:46:52 -05:00
Vinnie Okada a9cd3bfaee Fix external commit links 
Display the '@' character for links to commits in other projects.
 2014-10-05 10:16:12 -05:00
Vinnie Okada bcf88c8559 Fix external issue links 
Display the project path in links to issues in other projects that use
an external issue tracker.
 2014-10-05 10:12:53 -05:00
Ciro Santilli 07e9cb6b77 Factor markup? || gitlab_markdown? into new method 2014-10-04 17:56:12 +02:00
Sullivan SENECHAL c0e2eee38b Fix fa-download icon 2014-10-04 16:58:59 +02:00
Bernhard Kaindl 84fbd29351 transfer_service_spec: cleanup, merge common code, check against nil 
- replace creation of group2 with the use of group without add_owner(user)
- fold TransferService calls into new test function transfer_project
  - remove currently not used (and not working) gitlab_shell stub
    (will submit testcase simulating failure in gitlab_shell separately)
- add checks against not be_nil (result.should be_false passes even if nil)
 2014-10-04 12:29:24 +02:00
Ciro Santilli d927499894 Remove unused Project#code function. 2014-10-04 10:54:00 +02:00
Dmitriy Zaporozhets ac71c386f9 Merge branch 'minor-ui-improvements' into 'master' 
Minor ui improvements

See merge request !1152
 2014-10-04 07:03:17 +00:00