home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 21:46:16 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,040 Commits 48 Branches 340 Tags
42ebefc3e90c08d39e2bb4a24e778681fce2c588
Commit Graph
16040 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sytse Sijbrandij 42ebefc3e9 Merge branch 'doc_rebase' into 'master' 
separate documentation for rebase before merge

fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2108

See merge request !350
 2015-03-13 00:05:06 +00:00
Marc Radulescu c30629e15f add documentation file 2015-03-12 16:58:11 -07:00
Marc Radulescu d3b4f65da9 separate documentation for rebase before merge 2015-03-12 16:32:26 -07:00
Dmitriy Zaporozhets 49901eb315 Merge branch 'ce_upstream1' into 'master' 
Ce upstream

See merge request !349
 2015-03-12 18:18:43 +00:00
Valery Sizov e3df22f224 Merge remote-tracking branch 'dev/master' into ce_upstream1 2015-03-12 18:39:24 +02:00
Marin Jankovski ec1c30ceec Merge branch 'hover_toggle_sidebar' 
Conflicts:
	app/assets/stylesheets/generic/nav_sidebar.scss
 2015-03-12 09:32:52 -07:00
Dmitriy Zaporozhets d377e94b35 Merge branch 'refactoring_group_controllers' into 'master' 
Group controllers refactoring

Usefulness of this refactoring is not so obvious on CE codebase. But It will allow us to remove huge amount of code on the EE side.

See merge request !1684
 2015-03-12 16:11:51 +00:00
Dmitriy Zaporozhets c216a30519 Merge branch 'ce-to-ee' into 'master' 
CE to EE

cc @marin

See merge request !347
 2015-03-12 15:59:58 +00:00
Valery Sizov 0b38c3e041 group controller refactoring 2015-03-12 17:08:48 +02:00
Marin Jankovski 3f823068e1 Add deploy to ci.gitlab.com to release documents. 2015-03-11 21:11:32 -07:00
Dmitriy Zaporozhets f29a7ce51f Merge branch 'markdown-smb-link' into 'master' 
Allow smb:// links in Markdown text.

As requested by Sam McLeod at https://gitlab.com/gitlab-org/gitlab-ce/issues/1184

See merge request !1669
 2015-03-12 03:57:52 +00:00
Dmitriy Zaporozhets fa5eb397e1 Fix spinach test 2015-03-11 20:54:21 -07:00
Dmitriy Zaporozhets 85e3b25c04 Merge branch 'new-emoji' into 'master' 
Update html-pipeline and emoji

See merge request !1680
 2015-03-12 03:44:36 +00:00
Dmitriy Zaporozhets be4d340381 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	Gemfile.lock
	app/controllers/uploads_controller.rb
	app/models/application_setting.rb
	app/models/project_services/issue_tracker_service.rb
	app/views/projects/services/_form.html.haml
	db/schema.rb
	doc/integration/README.md
	features/steps/groups.rb
 2015-03-11 18:41:41 -07:00
Marin Jankovski 2074bafd07 Add packages for 7.8.3 and 7.8.4. 2015-03-11 18:28:31 -07:00
Dmitriy Zaporozhets ccc2c6e762 Fix Gemfile.lock 2015-03-11 18:03:21 -07:00
Dmitriy Zaporozhets c02d891cb5 Merge branch 'master' into new-emoji 
Conflicts:
	Gemfile.lock
 2015-03-11 18:02:37 -07:00
Sytse Sijbrandij f186b20cb2 Merge branch 'ami-to-update-guides' into 'master' 
add AMI update step

See merge request !1677
 2015-03-12 00:56:25 +00:00
Dmitriy Zaporozhets d0e11f37e3 Merge branch 'reduce-notice-count' into 'master' 
Remove annoying notice messages when create/update merge request

See merge request !1681
 2015-03-12 00:55:06 +00:00
Dmitriy Zaporozhets d6dda952b8 Fix tests for emojione 2015-03-11 17:52:02 -07:00
Marin Jankovski 66384d7d44 Add a note about building AMI to security doc 2015-03-11 17:50:02 -07:00
Dmitriy Zaporozhets bba1422309 Merge branch 'bump_gitlab_git' into 'master' 
Bump gitlab_git to v7.1.0. It should fix a lot of encoding issues

For gitlab/gitlab_git!24

See merge request !1679
 2015-03-12 00:43:26 +00:00
Dmitriy Zaporozhets 5f40253f76 Remove annoying notice messages when create/update merge request 2015-03-11 16:07:33 -07:00
Dmitriy Zaporozhets d2d709a252 Update html-pipeline and emoji 2015-03-11 16:05:01 -07:00
Dmitriy Zaporozhets 5c4f567ea0 Bump gitlab_git to v7.1.0. It should fix a lot of encoding issues 2015-03-11 13:52:55 -07:00
Dmitriy Zaporozhets c5f7714dbe Merge branch 'ldap-filter-eq' into 'master' 
Escape wildcards when searching LDAP by group name.

Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2086.

Also see https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1644 and https://dev.gitlab.org/gitlab/omniauth-ldap/merge_requests/2.

See merge request !344
 2015-03-11 20:06:23 +00:00
Marin Jankovski 88e4aed9df Update changelog for 7.8.4. 2015-03-11 13:03:23 -07:00
Marin Jankovski 1647994ada Merge branch 'fix-code-preview' into 'master' 
Fix code preview theme setting for comments, issues, merge requests, and snippets

User color scheme was not being used: default white color scheme was always chosen. Also, default background for code in notes was always overriding the user color scheme.

Closes #1139

See merge request !357
 2015-03-11 18:41:36 +00:00
Dmitriy Zaporozhets b2f6567961 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-11 09:57:59 -07:00
Dmitriy Zaporozhets e349ca1353 Merge branch 'ldap-filter-eq' into 'master' 
Escape wildcards when searching LDAP by username.

Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2086.

Also see https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/344 and https://dev.gitlab.org/gitlab/omniauth-ldap/merge_requests/2.

See merge request !1644
 2015-03-11 16:57:28 +00:00
Dmitriy Zaporozhets 8cebbea7c2 Merge branch 'issues_url' into 'master' 
Remove placeholder methods to prevent calling methods rather than attributes.

Since we have https://dev.gitlab.org/gitlab/gitlabhq/blob/7-8-stable/app/models/service.rb#L79 makes no sense to have methods as a placeholder.

See merge request !1676
 2015-03-11 16:56:58 +00:00
Dmitriy Zaporozhets d12a6ac49a Merge branch 'dashboard-restyle' into 'master' 
Dashboard restyle

For #2069

See merge request !1675
 2015-03-11 16:56:01 +00:00
Hannes Rosenögger b0c1bc6657 Merge branch 'generate-valid-json' into 'master' 
Generate valid json

This patch helps to be compatible to other programing languages as it improves the validation of hook data. It seems only ruby can handle 'nil' as value while other json decode function will fatal.

See merge request !182
 2015-03-11 16:53:10 +00:00
Douwe Maan 11e966d7a9 Add changelog item. 2015-03-11 17:43:40 +01:00
Job van der Voort 536d437373 add AMI update step 2015-03-11 17:31:39 +01:00
Dmitriy Zaporozhets 9ed71f77fe Remove tests for un-existing page 2015-03-10 23:34:18 -07:00
Hannes Rosenögger 94affe6d51 Merge branch 'master' into 'master' 
Make email display name configurable

#216

See merge request !80
 2015-03-11 05:41:58 +00:00
Dmitriy Zaporozhets 4b1bb42bf7 Fix tests for project removing 2015-03-10 21:56:19 -07:00
Vyacheslav Slinko 61ed518781 Make email display name configurable 2015-03-11 11:04:23 +07:00
Marin Jankovski 6d0ff0ade8 Remove placeholder methods to prevent calling methods rather than attributes. 2015-03-10 18:09:13 -07:00
Dmitriy Zaporozhets c621a7712b Merge branch 'fix-forms' into 'master' 
Fix features checkboxes at admin settings page

For !1615

See merge request !1674
 2015-03-11 01:00:35 +00:00
Dmitriy Zaporozhets 9839d106c4 Rename dashboard landing page to Your projects 2015-03-10 16:06:30 -07:00
Dmitriy Zaporozhets 0414b2ae98 Remove projects page from dashboard 2015-03-10 16:03:37 -07:00
Dmitriy Zaporozhets 83f7e98d9a Add project filter by visibility and tag to explore page 2015-03-10 15:59:14 -07:00
Dmitriy Zaporozhets 8527e8d599 Fix test for creating group from dashboard 2015-03-10 15:19:28 -07:00
Dmitriy Zaporozhets 04c674e679 Cleanup after removing group tab from dashboard aside 2015-03-10 13:27:58 -07:00
Dmitriy Zaporozhets 7fd4dc1e11 Remove group rendering from dashboard page 2015-03-10 13:17:16 -07:00
Dmitriy Zaporozhets f0a132ed99 Merge branch 'active-users-check' into 'master' 
Active users check

For gitlab/gitlab-ee#248

See merge request !1673
 2015-03-10 20:04:26 +00:00
Dmitriy Zaporozhets ea7478d6b5 Fix features checkboxes at admin settings page 2015-03-10 12:59:39 -07:00
Dmitriy Zaporozhets c572bdb587 Add CHANGELOG item about db migration 2015-03-10 12:10:26 -07:00