summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated help documentation to properly reference EmojiOne. [ci skip]Cameron Banga2015-03-122-10/+11
* Merge branch 'ami-to-update-guides' into 'master'Sytse Sijbrandij2015-03-123-0/+6
|\
| * Add a note about building AMI to security docMarin Jankovski2015-03-111-0/+1
| * add AMI update stepJob van der Voort2015-03-112-0/+5
* | Merge branch 'reduce-notice-count' into 'master'Dmitriy Zaporozhets2015-03-121-6/+2
|\ \
| * | Remove annoying notice messages when create/update merge requestDmitriy Zaporozhets2015-03-111-6/+2
* | | Merge branch 'bump_gitlab_git' into 'master'Dmitriy Zaporozhets2015-03-122-4/+4
|\ \ \ | |/ / |/| |
| * | Bump gitlab_git to v7.1.0. It should fix a lot of encoding issuesDmitriy Zaporozhets2015-03-112-4/+4
|/ /
* | Update changelog for 7.8.4.Marin Jankovski2015-03-111-0/+6
* | Merge branch 'fix-code-preview' into 'master'Marin Jankovski2015-03-1110-4/+40
|\ \
| * | Fix code preview theme setting for comments, issues, merge requests, and snip...Stan Hu2015-03-1010-4/+40
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-117-3/+10
|\ \ \
| * \ \ Merge branch 'generate-valid-json' into 'master'Hannes Rosenögger2015-03-113-1/+3
| |\ \ \
| | * | | Generate valid json for hooksNicole Cordes2015-03-103-1/+3
| * | | | Merge branch 'master' into 'master'Hannes Rosenögger2015-03-115-2/+7
| |\ \ \ \
| | * | | | Make email display name configurableVyacheslav Slinko2015-03-115-3/+7
* | | | | | Merge branch 'ldap-filter-eq' into 'master'Dmitriy Zaporozhets2015-03-113-1/+4
|\ \ \ \ \ \
| * | | | | | Escape wildcards when searching LDAP by username.Douwe Maan2015-03-063-1/+4
* | | | | | | Merge branch 'issues_url' into 'master'Dmitriy Zaporozhets2015-03-111-12/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove placeholder methods to prevent calling methods rather than attributes.Marin Jankovski2015-03-101-12/+0
* | | | | | | | Merge branch 'dashboard-restyle' into 'master'Dmitriy Zaporozhets2015-03-1128-384/+126
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Remove tests for un-existing pageDmitriy Zaporozhets2015-03-101-9/+0
| * | | | | | | Fix tests for project removingDmitriy Zaporozhets2015-03-102-6/+1
| * | | | | | | 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 pageDmitriy Zaporozhets2015-03-101-16/+24
| |/ / / / /
* | | | | | Merge branch 'active-users-check' into 'master'Dmitriy Zaporozhets2015-03-102-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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 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
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |