summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | Rename dashboard landing page to Your projectsDmitriy Zaporozhets2015-03-103-4/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Remove projects page from dashboardDmitriy Zaporozhets2015-03-106-108/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add project filter by visibility and tag to explore pageDmitriy Zaporozhets2015-03-108-144/+88
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix test for creating group from dashboardDmitriy Zaporozhets2015-03-104-27/+27
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Cleanup after removing group tab from dashboard asideDmitriy Zaporozhets2015-03-102-40/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Remove group rendering from dashboard pageDmitriy Zaporozhets2015-03-106-46/+6
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fix-forms' into 'master'Dmitriy Zaporozhets2015-03-111-16/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix features checkboxes at admin settings page For !1615 See merge request !1674
| * | | | | | | | | | | | | Fix features checkboxes at admin settings pageDmitriy Zaporozhets2015-03-101-16/+24
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'active-users-check' into 'master'Dmitriy Zaporozhets2015-03-102-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Active users check For gitlab/gitlab-ee#248 See merge request !1673
| * | | | | | | | | | | | Update CHANGELOGDmitriy Zaporozhets2015-03-101-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add active users to gitlab:checkDmitriy Zaporozhets2015-03-101-0/+5
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Add CHANGELOG item about db migrationDmitriy Zaporozhets2015-03-101-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-106-4/+47
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'upgrade-dockerfile' into 'master'Robert Schilling2015-03-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | Upgrade Docker image to GitLab v7.8.3Stan Hu2015-03-101-1/+1
| | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into 'master'Hannes Rosenögger2015-03-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | Added a link_to for the LinkedIn portion of the user's profile. It felt odd ↵Ben Carson2015-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to me, having this section not being an active link like the rest of the entries on the page.
| * | | | | | | | | | | | Merge branch 'fix-import-redirect' into 'master'Hannes Rosenögger2015-03-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | Fixing import redirect loopDJ Mountney2015-03-091-1/+1
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While importing, don't redirect import actions to the project page, even if the repository exists
| * | | | | | | | | | | | Merge branch 'fix-commit-calendar-emails' into 'master'Douwe Maan2015-03-103-1/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | This MR extends the commit calendar so it searches for commits made with ↵Stan Hu2015-03-093-1/+44
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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."
* | | | | | | | | | | | Merge branch 'fix_importers' into 'master'Dmitriy Zaporozhets2015-03-104-14/+42
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | remove duplicationValery Sizov2015-03-102-2/+23
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix importers with OCCValery Sizov2015-03-103-14/+21
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'uploads-authorization' into 'master'Dmitriy Zaporozhets2015-03-103-16/+329
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | Reject access to group/project avatar if the user doesn't have access.Douwe Maan2015-03-103-16/+329
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'fix-line-highlight' into 'master'Dmitriy Zaporozhets2015-03-107-9/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix highlight of selected lines * show color for highlighted line * fix overflow by header See merge request !1672
| * | | | | | | | | | | Fix line highlight being hidden by headerDmitriy Zaporozhets2015-03-101-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fix highlight of selected linesDmitriy Zaporozhets2015-03-106-8/+9
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'issues-tracker-id' into 'master'Marin Jankovski2015-03-101-6/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | Properly move over `issues_tracker_id` from old custom issue tracker URLs.Douwe Maan2015-03-101-6/+6
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'gitlab-git-helper-methods' into 'master'Dmitriy Zaporozhets2015-03-1021-78/+73
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | Use Gitlab::Git helper methods and constants as much as possible.Douwe Maan2015-03-1021-78/+73
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'emailsonpush-changelog' into 'master'Dmitriy Zaporozhets2015-03-101-0/+9
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention EmailsOnPush changes in changelog. See merge request !1667
| * | | | | | | | | | Mention EmailsOnPush changes in changelog.Douwe Maan2015-03-101-0/+9
|/ / / / / / / / / /
* | | | | | | | | | Improve tree view UIDmitriy Zaporozhets2015-03-101-3/+8
| | | | | | | | | |
* | | | | | | | | | Merge branch 'active-users' into 'master'Dmitriy Zaporozhets2015-03-106-22/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blocking user does not remove him/her from project/groups but show blocked label For #248 See merge request !1664
| * | | | | | | | | | Blocking user does not remove him/her from project/groups but show blocked labelDmitriy Zaporozhets2015-03-096-22/+9
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'cve-if-needed' into 'master'Dmitriy Zaporozhets2015-03-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Add criteria for requesting CVEDmitriy Zaporozhets2015-03-091-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Fix font size for collapse buttonDmitriy Zaporozhets2015-03-091-0/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'font-size-14' into 'master'Dmitriy Zaporozhets2015-03-1013-29/+14
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Reduce base vertical paddingDmitriy Zaporozhets2015-03-092-4/+2
| | | | | | | | | | |
| * | | | | | | | | | Increate default font-size from 13 to 14pxDmitriy Zaporozhets2015-03-0911-25/+12
| | | | | | | | | | |
* | | | | | | | | | | Fix heading small color to darker oneDmitriy Zaporozhets2015-03-091-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Make broadcast message look like a warning by defaultDmitriy Zaporozhets2015-03-092-12/+11
| | | | | | | | | |
* | | | | | | | | | Fix wrong body padding and pre colorDmitriy Zaporozhets2015-03-092-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'more-flat-ui' into 'master'Dmitriy Zaporozhets2015-03-106-23/+31
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply more styles from Flatly theme Also add bottom margin for footer links on login page See merge request !1661
| * | | | | | | | | Apply more styles from Flatly themeDmitriy Zaporozhets2015-03-096-23/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add bottom margin for footer links on login page
* | | | | | | | | | Merge branch 'improve-milestones-ui' into 'master'Dmitriy Zaporozhets2015-03-108-12/+23
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve milestones ui * change progress bar colors * make milestone title bold See merge request !1660