home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,945 Commits 48 Branches 340 Tags
04b09bdd6793df01ef488a8480be8fce48cb3f09
Commit Graph
6762 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 9a3afa4d19 Merge branch 'refactor-avatars' into 'master' 
Refactor avatars css

See merge request !1487
 2015-02-07 21:26:26 +00:00
Dmitriy Zaporozhets 72cf8173ad Merge branch 'clean-up-devise-views' into 'master' 
Clean up devise views

See merge request !1472
 2015-02-07 19:50:15 +00:00
Dmitriy Zaporozhets f228e17d39 Add project-avatar and group-avatar css classes 2015-02-07 11:38:58 -08:00
Dmitriy Zaporozhets 4cce10583d Fix tests for semaphore 2015-02-06 23:57:28 -08:00
Dmitriy Zaporozhets 89f8020fe1 Merge branch 'mention-groups' 
Conflicts:
	CHANGELOG
 2015-02-06 16:45:37 -08:00
Dmitriy Zaporozhets 3e97ac2022 Add index on order columns 2015-02-06 10:21:48 -08:00
Dmitriy Zaporozhets dd8dd92e50 Merge branch 'api-default-order' into 'master' 
Sorting refactoring

* refactor sorting logic for web UI
* refactor and document ordering for API: project, issues, merge requests
* explicitly define ordering in models using default_scope

See merge request !1476
 2015-02-06 18:08:44 +00:00
Dmitriy Zaporozhets 6b61c90498 Merge branch 'markdown-preview-via-post' into 'master' 
Don't have Markdown preview fail for long comments/wiki pages.

See https://github.com/gitlabhq/gitlabhq/issues/8611.

See merge request !1479
 2015-02-06 17:55:30 +00:00
Douwe Maan 639c93b4f2 Don't have Markdown preview fail for long content by using POST rather than GET. 
See https://github.com/gitlabhq/gitlabhq/issues/8611.
 2015-02-06 11:23:12 +01:00
Valery Sizov b3c90dd514 GitHub importer refactoring 2015-02-05 21:48:21 -08:00
Dmitriy Zaporozhets 8952fc015f Apply default scope to labels and remove one for notes 2015-02-05 20:29:41 -08:00
Dmitriy Zaporozhets c5be267e40 Refactor issuable sorting a bit 2015-02-05 20:21:21 -08:00
Dmitriy Zaporozhets 85c2cb2a19 Merge branch 'submit-comment-on-command-enter' into 'master' 
Submit comment on command enter

Fixes #1869.

See merge request !1474
 2015-02-06 03:46:25 +00:00
Dmitriy Zaporozhets ff6a5fb31b Merge branch 'remove-group-milestone-participants-duplicates' into 'master' 
Remove duplicates from group milestone participants list.

See merge request !1473
 2015-02-06 03:38:05 +00:00
Dmitriy Zaporozhets bbca6a0abd Refactor sorting in project 2015-02-05 19:15:05 -08:00
Valery Sizov 1ac20698a5 gitlab.com importer: refactorig 2015-02-05 17:03:43 -08:00
Dmitriy Zaporozhets e0aa5c371e Fix method overlap for issue sorting 2015-02-05 16:49:41 -08:00
Dmitriy Zaporozhets 62ed1c537e Explicitly define ordering in models using default_scope 2015-02-05 14:20:55 -08:00
Douwe Maan 71668312c4 Submit comment on command-enter. 
Fixes #1869.
 2015-02-05 21:56:25 +01:00
Valery Sizov 592ed8738c Gitlab.com integration: code folding 2015-02-05 12:50:34 -08:00
Valery Sizov 33349dd549 GitLab.com integration: refactoring 2015-02-05 12:50:34 -08:00
Valery Sizov 713bc152bd GitLab.com integration: small view fix 2015-02-05 12:50:34 -08:00
Valery Sizov 18231b0bb3 GitLab.com integration: refactoring 2015-02-05 12:50:34 -08:00
Valery Sizov 5194214e3a GitLab integration. Importer 2015-02-05 12:50:34 -08:00
Douwe Maan 58ecb06f74 Remove duplicates from group milestone participants list. 2015-02-05 21:26:57 +01:00
Douwe Maan 485e55f88c Clean up devise views. 2015-02-05 19:12:47 +01:00
Douwe Maan 9910b7ff99 Allow groups to be mentioned. 
Resolves #1673.
 2015-02-05 19:10:52 +01:00
Dmitriy Zaporozhets 0a9cab4ee6 Merge branch 'dont-download-image-attachments' 
Conflicts:
	CHANGELOG
 2015-02-05 09:54:38 -08:00
Dmitriy Zaporozhets 50e8e5943f Merge branch 'redirect-sign_up' into 'master' 
Redirect signup page to signin page.

Resolves #1916.

See merge request !1468
 2015-02-05 16:47:11 +00:00
Douwe Maan ab22caa97e Redirect signup page to signin page. 
Resolves #1916.
 2015-02-05 15:56:28 +01:00
Dmitriy Zaporozhets 0e2fcb68d7 Disable project path blacklist 
Because since project always belongs to namespace it dont need such
strict restrictions any more
 2015-02-04 15:23:38 -08:00
Dmitriy Zaporozhets 3a533d48c6 Merge branch 'font-variable' into 'master' 
Removes the hard-coded font in the diff notes

Removes the hard-coded font in the diff notes and switches to using the $regular_font variable.

See merge request !259
 2015-02-04 23:06:26 +00:00
Dmitriy Zaporozhets c2c1630905 Merge branch 'fix/groupsearch' into 'master' 
Fix group search to check path as well as name

The API documentation says:

"You can search for groups by name or path with: /groups?search=Rails"

But you can't because the search query only checks the name, not the path. This fixes that.

See merge request !325
 2015-02-04 23:01:52 +00:00
Dmitriy Zaporozhets 60b80541cd Merge pull request #8726 from jvanbaarsen/sidebar-colors-comment 
Also show colors in the sidebar of comment
 2015-02-04 14:47:57 -08:00
Douwe Maan f4ce0ddde4 Show image attachments in browser instead of downloading them. 
Resolves #1702.
 2015-02-04 15:35:10 +01:00
Dmitriy Zaporozhets 347ce399ab Merge branch 'blame_encoding_error_fix' into 'master' 
Fix for a "500: Encoding error" in the blame view

What does this MR do?

- The change enforces UTF-8 encoding on the source line data obtained from the Git.

Are there points in the code the reviewer needs to double check?

- The fix might not be enough to fix all encoding error issues in the blame view. There might be similar encoding issues if there are non-UTF-8 encoded names, for example

Why was this MR needed?

- This change fixes the "500: encoding error" that I get when I try to view the Gitlab source CHANGELOG file.

What are the relevant issue numbers / Feature requests?

- Gitlab issue #894: https://gitlab.com/gitlab-org/gitlab-ce/issues/894

See merge request !298
 2015-02-04 04:32:48 +00:00
Dmitriy Zaporozhets a8b4756f29 Merge branch 'mwessel/gitlab-ce-configure-protection' into 'master' 
Mwessel/gitlab ce configure protection

See merge request !1467
 2015-02-04 04:25:07 +00:00
Dmitriy Zaporozhets 0bcd5ca4eb Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-02-03 19:27:06 -08:00
Dmitriy Zaporozhets 3db8e4524d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-03 19:26:49 -08:00
Dmitriy Zaporozhets 635ebac606 Merge branch 'master' into mwessel/gitlab-ce-configure-protection 2015-02-03 17:54:33 -08:00
Dmitriy Zaporozhets a424a44242 Merge branch 'remove_hidden_settings_text' into 'master' 
Remove hidden settings text on project settings

No need to have the hidden settings text anymore as the danger area is now unified.

See merge request !320
 2015-02-04 01:51:31 +00:00
Dmitriy Zaporozhets cb2093fb61 Merge pull request #8702 from m-a-r-c-o/raw-image-paste-fix 
Fix raw image paste from clipboard
 2015-02-03 17:49:15 -08:00
Sytse Sijbrandij 7b233ea853 Spelling improvement, add in a group, not into group. 2015-02-03 16:55:31 -08:00
Dmitriy Zaporozhets ca0f107809 Merge branch 'webhook-rescue' into 'master' 
Webhook rescue Errno::ECONNRESET

Fixes #1821

See merge request !1466
 2015-02-03 22:42:28 +00:00
Dmitriy Zaporozhets a89d7adfa4 Rescue connection reset for web hooks 2015-02-03 13:57:28 -08:00
Dmitriy Zaporozhets 46dd5fc47e Merge branch 'jasonblanchard-collapseable-nav' into 'master' 
Collapseable sidebar

See merge request !1465
 2015-02-03 21:56:26 +00:00
Dmitriy Zaporozhets 254a63dcf7 Improve collapsing sidebar 2015-02-03 13:11:33 -08:00
Dmitriy Zaporozhets ded30e3efe Merge branch 'collapseable-nav' of https://github.com/jasonblanchard/gitlabhq into jasonblanchard-collapseable-nav 2015-02-03 12:05:11 -08:00
Sytse Sijbrandij e0d85078ba Push can be multiple files. 2015-02-03 11:23:59 -08:00
Dmitriy Zaporozhets 8618277f24 Merge branch 'issue-merge-req-context-links' of https://github.com/jasonblanchard/gitlabhq into jasonblanchard-issue-merge-req-context-links 
Conflicts:
	CHANGELOG
 2015-02-03 11:22:16 -08:00