home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,081 Commits 48 Branches 340 Tags
1308a8a0ef27ea241301ab0585647761a2ffeb0e
Commit Graph
3952 Commits
Author SHA1 Message Date
Valery Sizov 45ec0d255d Merge remote-tracking branch 'ee/master' into ce_non_conflict 
Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
 2015-02-05 22:01:05 -08:00
Valery Sizov 1ac20698a5 gitlab.com importer: refactorig 2015-02-05 17:03:43 -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
Dmitriy Zaporozhets 9b140b22fb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee 
Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb
 2015-02-04 18:19:22 -08: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
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
Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb
 2015-01-29 11:34:43 -08: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
Dmitriy Zaporozhets b40809d731 Improve UX for widget if merge request can not be merged 2015-01-28 11:25:13 -08:00
Dmitriy Zaporozhets 965cec68ac Project/Group access dropdown should contain link to permissions help page 2015-01-28 10:53:28 -08:00
Dmitriy Zaporozhets 8eb365c0a0 Separate admin settings from other links 2015-01-27 22:54:46 -08:00
Dmitriy Zaporozhets f79f758581 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-27 22:51:36 -08:00
Dmitriy Zaporozhets 50297f7134 Fix gravatar size for head panel icon 2015-01-27 22:51:11 -08:00
Visay Keo 35d6d1ce46 Fix broadcast message to show up properly with new UI 
With the new UI, the broadcast message is the first level child element
of the body tag and then render full width without respecting the width
of the left sidebar. This makes the message goes under the left sidebar
in smaller screen.

This commit fixes the issue by moving the message element into the
"page-with-sidebar" div so it will always render together with the main
content area with same look as before. The rendering for the search,
login and other view without left sidebar remains untouched.

Releases: master, 7-7-stable
Fixes: #1019
 2015-01-28 07:24:05 +07:00
Dmitriy Zaporozhets f57bffc82a Merge branch 'init-from-ui' into 'master' 
Add tests for creating bare repo and first file in UI

Part of #1930

See merge request !1444
 2015-01-27 21:27:59 +00:00
Dmitriy Zaporozhets fc17b440f9 Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master' 
Move external issue tracker away from yml config

See merge request !1442
 2015-01-27 20:57:48 +00:00
Dmitriy Zaporozhets e13868fa69 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-27 12:48:07 -08:00
Dmitriy Zaporozhets 8933149b9e Merge branch 'add_titles_to_links' into 'master' 
Add titles to all nav links

See merge request !313
 2015-01-27 19:41:46 +00:00
Dmitriy Zaporozhets 2fa36ddd9c Replace p with h4 for empty repo text 2015-01-27 11:32:28 -08:00
Sytse Sijbrandij 233f9f0766 Prevent confusion between active users and 30 day users. 2015-01-27 09:35:46 -08:00
Dmitriy Zaporozhets 65e88f1e1a Fixed few tests and improved css style 2015-01-26 22:39:48 -08:00
Marin Jankovski 0da59cb55b Merge branch 'master' into move_external_issue_tracker_away_from_yml_config 
Conflicts:
	app/models/project.rb
	spec/models/project_spec.rb
 2015-01-26 22:12:53 -08:00
Dmitriy Zaporozhets 8ecf7d3207 Improve web editor filename placeholder 2015-01-26 20:58:38 -08:00
Dmitriy Zaporozhets a3d879d427 Refactor web editor 2015-01-26 20:57:42 -08:00