summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 'master'Hannes Rosenögger2015-03-115-2/+7
|\
| * Make email display name configurableVyacheslav Slinko2015-03-115-3/+7
* | 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 image to GitLab v7.8.3Stan Hu2015-03-101-1/+1
| * | | Merge branch 'master' into 'master'Hannes Rosenögger2015-03-101-1/+1
| |\ \ \
| | * | | Added a link_to for the LinkedIn portion of the user's profile. It felt odd t...Ben Carson2015-03-101-1/+1
| * | | | Merge branch 'fix-import-redirect' into 'master'Hannes Rosenögger2015-03-101-1/+1
| |\ \ \ \
| | * | | | Fixing import redirect loopDJ Mountney2015-03-091-1/+1
| | |/ / /
| * | | | Merge branch 'fix-commit-calendar-emails' into 'master'Douwe Maan2015-03-103-1/+44
| |\ \ \ \
| | * | | | This MR extends the commit calendar so it searches for commits made with ever...Stan Hu2015-03-093-1/+44
| | | |_|/ | | |/| |
* | | | | Merge branch 'fix_importers' into 'master'Dmitriy Zaporozhets2015-03-104-14/+42
|\ \ \ \ \
| * | | | | 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.Douwe Maan2015-03-103-16/+329
| |/ / / /
* | | | | Merge branch 'fix-line-highlight' into 'master'Dmitriy Zaporozhets2015-03-107-9/+10
|\ \ \ \ \
| * | | | | 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.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.Douwe Maan2015-03-1021-78/+73
| |/ / / /
* | | | | Merge branch 'emailsonpush-changelog' into 'master'Dmitriy Zaporozhets2015-03-101-0/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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 labelDmitriy Zaporozhets2015-03-096-22/+9
* | | | | Merge branch 'cve-if-needed' into 'master'Dmitriy Zaporozhets2015-03-101-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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 themeDmitriy Zaporozhets2015-03-096-23/+31
* | | | Merge branch 'improve-milestones-ui' into 'master'Dmitriy Zaporozhets2015-03-108-12/+23
|\ \ \ \ | |/ / / |/| | |
| * | | Make milestone titles in list to be boldDmitriy Zaporozhets2015-03-091-0/+6
| * | | Render milestone progress with one helper methodDmitriy Zaporozhets2015-03-097-12/+17
| |/ /
* | | Merge branch 'starred-projects' into 'master'Dmitriy Zaporozhets2015-03-0911-3/+99
|\ \ \
| * | | Add tests for starred projects pageDmitriy Zaporozhets2015-03-093-0/+31
| * | | Add starred projects page to dashboardDmitriy Zaporozhets2015-03-098-3/+68
| |/ /
* | | Merge branch 'admin-user-block' into 'master'Dmitriy Zaporozhets2015-03-092-38/+43
|\ \ \ | |/ / |/| |
| * | Improve user block/unblock UI in admin areaDmitriy Zaporozhets2015-03-092-38/+43
|/ /
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-094-11/+5
|\ \
| * \ Merge branch 'fix_initial_push_mass_sql' into 'master'Dmitriy Zaporozhets2015-03-093-10/+4
| |\ \