home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,968 Commits 48 Branches 340 Tags
bd19bce37c9ec0aa3af0e061005d7f146d799708
Commit Graph
3764 Commits
Author SHA1 Message Date
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 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 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
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 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 8952fc015f Apply default scope to labels and remove one for notes 2015-02-05 20:29:41 -08: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
Cameron Tacklind daa1796cf9 Be less restrictive on key comment extraction 2015-02-05 14:25:40 -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 5194214e3a GitLab integration. Importer 2015-02-05 12:50:34 -08:00
Douwe Maan 485e55f88c Clean up devise views. 2015-02-05 19:12:47 +01: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
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 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
Sytse Sijbrandij 7b233ea853 Spelling improvement, add in a group, not into group. 2015-02-03 16:55:31 -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
Jeroen van Baarsen 39bfe0aa1d Also show colors in the sidebar of comment 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-03 18:45:39 +01:00
Valery Sizov b9d9ac82a9 Commit page: async load branches info 
Conflicts:
	config/routes.rb
 2015-02-03 09:10:56 -08:00
Jason Blanchard ee955d7a12 Adds persistent collapse button for left side bar 2015-02-03 11:45:33 -05:00
Jason Blanchard 97d4ac4047 Adds link to milestone and keeping resource context on smaller 
viewports for issues and merge requests
 2015-02-03 11:41:32 -05:00
Dmitriy Zaporozhets 2bd70b6a01 Improve project icons for dashboard 2015-02-02 15:47:51 -08:00
Jeremy b4d9ceb26f Add Asana service 
Also add ability to render "service.help" in markdown
 2015-02-02 09:59:42 +01:00
Dmitriy Zaporozhets 78d7c5087b Use tile avatars for user/group show pages 2015-01-29 17:30:51 -08:00
Dmitriy Zaporozhets 31245a40c1 Remove : from headers 2015-01-29 17:13:28 -08:00
Marco Wessel 20e269cb92 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into configure-protection 
Conflicts:
	CHANGELOG
	db/schema.rb
 2015-01-30 00:16:24 +01:00
Achilleas Pipinellis 4ce18089f6 Remove text about hidden settings. 2015-01-29 17:13:38 +02:00
Dmitriy Zaporozhets 1f0e16569f Load contribution calendar via AJAX 2015-01-29 01:20:17 -08:00
Dmitriy Zaporozhets a9288e554e Cleanup and make contribution calendar faster 2015-01-29 00:53:43 -08:00
Dmitriy Zaporozhets beb7a42548 Merge branch 'ux-fixes' into 'master' 
UX improvements (Implement lessons from user testing)

* add link to permissions help page from new project/group member form
* Improve UX for widget if merge request can not be merged
* Improve wording for fork project page

See merge request !1448
 2015-01-29 07:01:58 +00:00
Hannes Rosenögger 792ced2f41 Add a commit calendar to the user profile 2015-01-29 01:25:26 +01:00
Dmitriy Zaporozhets f2f7b5a18e Better wording 2015-01-28 15:37:20 -08:00
Dmitriy Zaporozhets 34b7472b33 Improve wording for fork project page 2015-01-28 14:20:00 -08:00