home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 11:36:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,717 Commits 48 Branches 340 Tags
d12a6ac49a77f8d33b618bb00d5055e0e6604ece
Commit Graph
14717 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dmitriy Zaporozhets 9ed71f77fe Remove tests for un-existing page 2015-03-10 23:34:18 -07:00
Dmitriy Zaporozhets 4b1bb42bf7 Fix tests for project removing 2015-03-10 21:56:19 -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
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
Dmitriy Zaporozhets ed29933d84 Merge branch 'emailsonpush-changelog' into 'master' 
Mention EmailsOnPush changes in changelog.

See merge request !1667
 2015-03-10 15:47:45 +00:00
Hannes Rosenögger 52a00854e9 Merge branch 'master' into 'master' 
Added link generation for LinkedIn on user's Profile page

This is a very very minor change. Added a generated link to the LinkedIn portion of the user's profile.

See merge request !377
 2015-03-10 15:16:04 +00:00
Ben Carson ee45fa89b6 Added a link_to for the LinkedIn portion of the user's profile. It felt odd to me, having this section not being an active link like the rest of the entries on the page. 2015-03-10 11:07:31 -04:00
Douwe Maan 76842aac75 Properly move over issues_tracker_id from old custom issue tracker URLs. 2015-03-10 14:14:49 +01:00
Douwe Maan 383c56efa1 Use Gitlab::Git helper methods and constants as much as possible. 2015-03-10 13:39:31 +01:00
Hannes Rosenögger 332413d7c4 Merge branch 'fix-import-redirect' into 'master' 
Fixing import redirect loop

While importing, don't redirect import actions to the project page, even if the repository exists

Fixes #1191

See merge request !379
 2015-03-10 10:58:35 +00:00
Valery Sizov ed4c7190ed Fix importers with OCC 2015-03-10 12:23:11 +02:00
Douwe Maan 6653cd7312 Mention EmailsOnPush changes in changelog. 2015-03-10 11:20:57 +01:00
Douwe Maan 94a955893c Merge branch 'fix-commit-calendar-emails' into 'master' 
Fix commit calendar to use all user emails

This MR improves upon Hannes Rosenögger's changes:

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/364

See merge request !378
 2015-03-10 08:58:35 +00:00
Dmitriy Zaporozhets e0caed91e2 Improve tree view UI 2015-03-10 00:51:16 -07:00
Stan Hu b26ab0ceeb This MR extends the commit calendar so it searches for commits made with every email address the user has associated with his account. 
This fixes one of the problems mentioned in gitlab-org/gitlab-ce#1162 and makes the behavior of the commit calendar as described in the profile.
"All email addresses will be used to identify your commits."
 2015-03-09 21:43:54 -07:00
Dmitriy Zaporozhets d086221f73 Merge branch 'active-users' into 'master' 
Blocking user does not remove him/her from project/groups but show blocked label

For #248

See merge request !1664
 2015-03-10 03:38:25 +00:00
Dmitriy Zaporozhets d881a92795 Merge branch 'cve-if-needed' into 'master' 
Add criteria for requesting CVE

For #1887. Based on https://dev.gitlab.org/gitlab/gitlabhq/issues/1945#note_34587

cc @sytse

See merge request !1662
 2015-03-10 03:38:03 +00:00
Dmitriy Zaporozhets 21c99e6a77 Fix font size for collapse button 2015-03-09 19:21:42 -07:00
Dmitriy Zaporozhets de629b4835 Blocking user does not remove him/her from project/groups but show blocked label 2015-03-09 19:02:30 -07:00
Dmitriy Zaporozhets f6113c2818 Merge branch 'font-size-14' into 'master' 
Font size 14px

Increase base font size from 13 to 14px. We already have it in most of ui elements so no need to duplicate `font-size: 14px` everywhere - just change base variable

See merge request !1663
 2015-03-10 01:46:21 +00:00
Dmitriy Zaporozhets 3bce263a3d Reduce base vertical padding 2015-03-09 18:45:36 -07:00
Dmitriy Zaporozhets fcaf0a89e8 Fix heading small color to darker one 2015-03-09 18:28:30 -07:00
Dmitriy Zaporozhets 9720240be2 Increate default font-size from 13 to 14px 2015-03-09 18:25:32 -07:00
Dmitriy Zaporozhets 86a17390dd Make broadcast message look like a warning by default 2015-03-09 18:09:23 -07:00
Dmitriy Zaporozhets 90f5dacc4b Fix wrong body padding and pre color 2015-03-09 17:59:32 -07:00
Dmitriy Zaporozhets b70b1055b1 Merge branch 'more-flat-ui' into 'master' 
Apply more styles from Flatly theme

Also add bottom margin for footer links on login page

See merge request !1661
 2015-03-10 00:41:01 +00:00
Dmitriy Zaporozhets ddd381c9a5 Add criteria for requesting CVE 2015-03-09 17:38:42 -07:00