home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 04:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,069 Commits 48 Branches 340 Tags
3386a82d5eb105f764e62e818bcec19b1c92be8e
Commit Graph
5985 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 8fad7e63a3 Add a bit of space between star icon and text 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-07 15:22:55 +03:00
Dmitriy Zaporozhets c0306f78d2 Merge branch 't1254-snippets-refactoring' into 'master' 
Snippets refactoring: rename public to internal. STEP 1

See merge request !1157
 2014-10-07 10:05:59 +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
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
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 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
Marin Jankovski 1db8d3104c Add missing comma. 2014-10-06 11:51:15 +02: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 e5998adc26 Accommodate new webhook url format. 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
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
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 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
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
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 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
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
Dmitriy Zaporozhets 03b44916ba Merge pull request #7754 from Bugagazavr/hooks 
More information in merge request hook
 2014-10-03 13:37:19 +03:00
Dmitriy Zaporozhets 4ebe718d69 Merge branch 'factor-commit-msg-textarea' of https://github.com/cirosantilli/gitlabhq into cirosantilli-factor-commit-msg-textarea 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/blob/_remove.html.haml
 2014-10-03 13:34:25 +03:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Marin Jankovski f74dba8c42 Merge pull request #7595 from bbodenmiller/patch-4 
add sign-in count
 2014-10-03 10:23:26 +02:00
Marin Jankovski 910d5cf332 Merge pull request #7748 from yglukhov/clickable-source-repo-in-mr 
Source repo is now clickable.
 2014-10-03 10:21:59 +02:00
Ciro Santilli 2e9f5de868 Add parenthesis to function def with arguments. 2014-10-03 09:18:46 +02:00
Kirill Zaitsev b4963e9dda Add tag_push_events to project hook api 2014-10-03 10:23:32 +04:00
Robert Schilling 06fd4bf7e1 Merge pull request #7922 from cirosantilli/improve-remove-file-commit-placeholder 
Improve remove file oommit message textarea placeholder.
 2014-10-03 00:00:33 +02:00
Dmitriy Zaporozhets 4e96c84e58 Merge branch 'show-build-coverage-in-mr' into 'master' 
Show build coverage in MR

![Screenshot 2014-10-02 18.20.53](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/a8ff7b23bd/Screenshot_2014-10-02_18.20.53.png)

See merge request !1148
 2014-10-02 16:25:19 +00:00
Dmitriy Zaporozhets 8e33f9460c Show test coverage results in MR if available 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-02 18:17:47 +03:00
Dmitriy Zaporozhets 929678899d Fix 500 error on admin user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-02 17:15:09 +03:00
Marin Jankovski cc2d7771db Merge branch 'feature/zen_for_gfm' of github.com:Razer6/gitlabhq into Razer6-feature/zen_for_gfm 
Conflicts:
	CHANGELOG
 2014-10-02 15:41:05 +02:00
Marin Jankovski 30c447ed2f Try signing in the user after user confirmation is correct and redirect to dashboard, otherwise redirect to signin page 2014-10-02 14:38:26 +02:00
Ciro Santilli 3098e7a453 Factor commit message textareas. 2014-10-02 12:03:30 +02:00
Dmitriy Zaporozhets d3388d4790 New label link 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-02 12:55:02 +03:00
Dmitriy Zaporozhets d2808476e3 Add new milestone link. Hide empty milestone selectbox 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-02 12:52:19 +03:00
Dmitriy Zaporozhets c6f3f9bb33 Merge branch 'factor-issue-mr-form-label' of https://github.com/cirosantilli/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/merge_requests/_form.html.haml
 2014-10-02 12:50:29 +03:00
Kirill Zaitsev 1c9d2e39c1 Hook attributes 2014-10-02 12:58:02 +04:00
Robert Schilling e2073f286e Merge pull request #7921 from cirosantilli/improve-new-file-commit-placeholder 
Improve new file commit message textarea placeholder.
 2014-10-02 10:33:09 +02:00
Robert Schilling 4b6bbf92ab Merge pull request #7881 from cirosantilli/rm-blame-extra-white 
Remove blame lines added leading whitespace.
 2014-10-02 10:29:03 +02:00
Robert Schilling 8d1137cd6d Merge pull request #7880 from cirosantilli/replace-erb-haml 
Replace :erb filter with plain HAML.
 2014-10-02 10:28:21 +02:00
Dmitriy Zaporozhets 6c3ad0dab6 Merge pull request #7853 from Razer6/feature/html_pipeline 
Factor out Emoji parsing using html-pipeline-gitlab
 2014-10-02 11:18:40 +03:00