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
12,055 Commits 48 Branches 340 Tags
7dcbf350197de169f3ca85b730c852e14c8feaa2
Commit Graph
12055 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ciro Santilli 7dcbf35019 Replace www.gitlab.com with about.gitlab.com 2014-10-07 13:16:19 +02: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
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
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
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
Sullivan SENECHAL c0e2eee38b Fix fa-download icon 2014-10-04 16:58:59 +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
Dmitriy Zaporozhets b2a45a1d35 Make nav links bold since some desktops does not render 500 properly 2014-10-03 22:01:23 +03:00
Dmitriy Zaporozhets 4adcd51133 Improve subnavigation style 2014-10-03 21:44:16 +03:00
Vinnie Okada 088987e2dd Make Mentionables work for cross-project refs 
Add a note to merge requests and issues when they're mentioned by a
merge request, issue, or commit in another project.
 2014-10-03 12:30:20 -05:00
Vinnie Okada 2c46c4523f Track projects in ReferenceExtractor 
Store both the project and identifier of extracted references.  This
prevents `ReferenceExtractor` from returning objects in the wrong
project for cross-project references.
 2014-10-03 12:30:20 -05:00
Vinnie Okada 7edc1439fe Fix ReferenceExtractor 
The cross-project reference feature broke the ReferenceExtractor class;
this fixes it.
 2014-10-03 12:30:20 -05:00
Vinnie Okada 1b1ba6b0a5 Implement cross-project Markdown references 
Enable linking to commits, merge requests, and issues in other projects
by prepending a namespaced project path to the reference.
 2014-10-03 12:30:20 -05:00
Dmitriy Zaporozhets c0bb3f5af2 Merge pull request #7931 from Soullivaneuh/pushover 
Add Pushover service integration
 2014-10-03 15:18:52 +03:00
Sullivan SENECHAL d1fa3b336d Add Pushover service integration 
That introduce select field type for services options.
 2014-10-03 13:54:37 +02:00
Dmitriy Zaporozhets 43217dd5dd Merge branch 'cirosantilli-factor-commit-msg-textarea' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/edit_tree/show.html.haml
 2014-10-03 14:38:33 +03:00
Dmitriy Zaporozhets 8188427e83 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-03 14:12:40 +03:00
Dmitriy Zaporozhets 5709e8d76c Merge branch 'new-milestone-link' into 'master' 
New milestone and label links

Fixes #1364

Fixes #1586

See merge request !1145
 2014-10-03 11:11:58 +00:00
Dmitriy Zaporozhets 5a541f5445 Merge branch 'signin_after_confirmation' into 'master' 
Signin after confirmation

Fixes #1471

See merge request !1146
 2014-10-03 11:11:12 +00:00
Robert Schilling 91e346eb33 Merge pull request #7948 from cirosantilli/rm-outdated-comment 
Remove outdated comment on the project test seed
 2014-10-03 12:57:09 +02:00
Robert Schilling 77979280e0 Merge pull request #7947 from cirosantilli/rm-assign-without-effect 
Remove assignment without effect.
 2014-10-03 12:52:04 +02:00
Dmitriy Zaporozhets 0676f1da7e Merge pull request #7934 from Soullivaneuh/font-awesome 
Upgrade to Font Awesome v4.2
 2014-10-03 13:42:24 +03:00
Dmitriy Zaporozhets ac6f032122 Merge pull request #7779 from Bugagazavr/hook_tag_push_events 
Add tag push events to project hook api
 2014-10-03 13:38:56 +03:00