home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,968 Commits 48 Branches 340 Tags
bd19bce37c9ec0aa3af0e061005d7f146d799708
Commit Graph
6782 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 3e4e5f7063 Merge branch 'improve-oauth-ux' into 'master' 
Improve OAuth UX

See merge request !1489
 2015-02-09 16:45:25 +00:00
Dmitriy Zaporozhets 0a34f2dcb5 Merge pull request #8580 from j0k3r/asana 
Add Asana service
 2015-02-08 01:12:41 -08:00
Dmitriy Zaporozhets fa3a7ef037 Merge pull request #8740 from cinderblock/master 
Be less restrictive on key comment extraction
 2015-02-08 01:07:23 -08:00
Dmitriy Zaporozhets 8c12c93e07 Merge pull request #8749 from sashkab/b8748-emailheader 
Addex X-GitLab-Project header to GitLab emails.
 2015-02-08 01:06:38 -08:00
Dmitriy Zaporozhets 03c8bf39e1 When add new social account - redirect to accounts page and show notice message 2015-02-08 00:53:31 -08:00
Dmitriy Zaporozhets 64673acf9f Merge branch 'duduribeiro-fix_showing_overflow' into 'master' 
Fix project sidebar overflow small screens

See merge request !1488
 2015-02-08 03:43:01 +00:00
Dmitriy Zaporozhets c5a16b8c60 Merge branch 'autosave' into 'master' 
Autosave and autorestore unsaved comments.

Closes #1738.

See merge request !1480
 2015-02-08 02:45:20 +00:00
Dmitriy Zaporozhets 6729e4cfc2 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-02-07 18:42:53 -08:00
Dmitriy Zaporozhets 3cd036e315 Merge branch 'notification_email' 
Conflicts:
	db/schema.rb
 2015-02-07 18:42:34 -08:00
Dmitriy Zaporozhets 377d461f26 Merge branch 'import-all-projects' into 'master' 
Add "Import all projects" button to GitHub and GitLab import pages.

Closes #1963.

See merge request !1482
 2015-02-08 02:39:29 +00:00
Dmitriy Zaporozhets e3a9bb8026 Merge branch 'fix_showing_overflow' of https://github.com/duduribeiro/gitlabhq into duduribeiro-fix_showing_overflow 2015-02-07 18:32:13 -08:00
Carlos Ribeiro eef461d4a1 Fix showing overflow when have several items at sidebar 2015-02-07 21:35:44 -02:00
Douwe Maan 9dbd7e5aec Allow notification email to be set separately from primary email. 
Closes #1932.
 2015-02-07 23:19:17 +01:00
Douwe Maan db7921f2d8 Add "Import all projects" button to GitHub and GitLab import pages. 
Closes #1963.
 2015-02-07 23:15:04 +01:00
Dmitriy Zaporozhets 9a3afa4d19 Merge branch 'refactor-avatars' into 'master' 
Refactor avatars css

See merge request !1487
 2015-02-07 21:26:26 +00:00
Douwe Maan 463d9f76e4 Autosave and autorestore unsaved comments. 
Closes #1738.
 2015-02-07 20:55:17 +01: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
Aleks Bunin 36b255e57b Addex X-GitLab-Project header to GitLab emails. 
Fixes #8748.
 2015-02-07 12:35:50 -05: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
Cameron Tacklind daa1796cf9 Be less restrictive on key comment extraction 2015-02-05 14:25:40 -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