home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-29 06:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Vinnie Okada 9623b71a39 More restricted visibility changes 
Bug fixes and new tests for the restricted visibility changes.
 2015-03-10 18:36:43 -06: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 100d750bc5 Add feature to disable version check 2015-03-10 12:51:46 -07:00
Dmitriy Zaporozhets c572bdb587 Add CHANGELOG item about db migration 2015-03-10 12:10:26 -07:00
Dmitriy Zaporozhets 961971544a Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-10 12:03:58 -07:00
Dmitriy Zaporozhets 0d4328fd00 Update CHANGELOG 2015-03-10 12:03:35 -07:00
Dmitriy Zaporozhets ae7e380632 Add active users to gitlab:check 2015-03-10 12:03:04 -07:00
Dmitriy Zaporozhets 828519ba05 Merge branch 'fix_importers' into 'master' 
Fix importers with OCC

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/1180

Using validates_uniqueness_of does not guarantee the absence of duplicate record insertions. When users click button "import all" it will create duplicating group in database and data integrity will be broken.

http://api.rubyonrails.org/classes/ActiveRecord/Validations/ClassMethods.html#method-i-validates_uniqueness_of

I use optimistic concurrency control for handling this situation.

See merge request !1647
 2015-03-10 19:01:05 +00:00
Dmitriy Zaporozhets 0fa4d0929d Merge branch 'uploads-authorization' into 'master' 
Reject access to group/project avatar if the user doesn't have access.

Closes #2050.

I'll add tests for EE logos once this is merged here and merged into EE.

See merge request !1671
 2015-03-10 18:20:46 +00:00
Dmitriy Zaporozhets be11f72d62 Merge branch 'fix-line-highlight' into 'master' 
Fix highlight of selected lines

* show color for highlighted line
* fix overflow by header

See merge request !1672
 2015-03-10 18:20:06 +00:00
Valery Sizov 02ed61c4db remove duplication 2015-03-10 20:09:34 +02:00
Dmitriy Zaporozhets 1178dacdb6 Fix line highlight being hidden by header 2015-03-10 10:50:53 -07:00
Dmitriy Zaporozhets cadf76562a Fix highlight of selected lines 2015-03-10 10:30:07 -07:00
Marin Jankovski 82bb3ec33d Merge branch 'issues-tracker-id' into 'master' 
Properly move over `issues_tracker_id` from old custom issue tracker URLs.

Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/1124.

cc @marin Regression in 7.8.0.

See merge request !1670
 2015-03-10 17:07:49 +00:00
Douwe Maan f5e42f602f Reject access to group/project avatar if the user doesn't have access. 2015-03-10 17:13:02 +01:00
Robert Schilling 14753c2e85 Merge branch 'upgrade-dockerfile' into 'master' 
Upgrade Docker build to GitLab v7.8.3

Upgrading from GitLab v7.8.1. Pretty simple change, tested with a quick Docker build.

See merge request !380
 2015-03-10 16:09:49 +00:00
Stan Hu 1fec4eff36 Upgrade Docker image to GitLab v7.8.3 2015-03-10 16:06:58 +00:00
Dmitriy Zaporozhets fe14535461 Merge branch 'gitlab-git-helper-methods' into 'master' 
Use Gitlab::Git helper methods and constants as much as possible.

As discussed in https://dev.gitlab.org/gitlab/gitlabhq/commit/1cc41ce1adce23d3eb4a9c4ed0ab17e11ea1f1e3#note_38702.

See merge request !1668
 2015-03-10 16:03:36 +00:00