Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Updated help documentation to properly reference EmojiOne. [ci skip] | Cameron Banga | 2015-03-12 | 2 | -10/+11 |
* | Merge branch 'ami-to-update-guides' into 'master' | Sytse Sijbrandij | 2015-03-12 | 3 | -0/+6 |
|\ | |||||
| * | Add a note about building AMI to security doc | Marin Jankovski | 2015-03-11 | 1 | -0/+1 |
| * | add AMI update step | Job van der Voort | 2015-03-11 | 2 | -0/+5 |
* | | Merge branch 'reduce-notice-count' into 'master' | Dmitriy Zaporozhets | 2015-03-12 | 1 | -6/+2 |
|\ \ | |||||
| * | | Remove annoying notice messages when create/update merge request | Dmitriy Zaporozhets | 2015-03-11 | 1 | -6/+2 |
* | | | Merge branch 'bump_gitlab_git' into 'master' | Dmitriy Zaporozhets | 2015-03-12 | 2 | -4/+4 |
|\ \ \ | |/ / |/| | | |||||
| * | | Bump gitlab_git to v7.1.0. It should fix a lot of encoding issues | Dmitriy Zaporozhets | 2015-03-11 | 2 | -4/+4 |
|/ / | |||||
* | | Update changelog for 7.8.4. | Marin Jankovski | 2015-03-11 | 1 | -0/+6 |
* | | Merge branch 'fix-code-preview' into 'master' | Marin Jankovski | 2015-03-11 | 10 | -4/+40 |
|\ \ | |||||
| * | | Fix code preview theme setting for comments, issues, merge requests, and snip... | Stan Hu | 2015-03-10 | 10 | -4/+40 |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-03-11 | 7 | -3/+10 |
|\ \ \ | |||||
| * \ \ | Merge branch 'generate-valid-json' into 'master' | Hannes Rosenögger | 2015-03-11 | 3 | -1/+3 |
| |\ \ \ | |||||
| | * | | | Generate valid json for hooks | Nicole Cordes | 2015-03-10 | 3 | -1/+3 |
| * | | | | Merge branch 'master' into 'master' | Hannes Rosenögger | 2015-03-11 | 5 | -2/+7 |
| |\ \ \ \ | |||||
| | * | | | | Make email display name configurable | Vyacheslav Slinko | 2015-03-11 | 5 | -3/+7 |
* | | | | | | Merge branch 'ldap-filter-eq' into 'master' | Dmitriy Zaporozhets | 2015-03-11 | 3 | -1/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Escape wildcards when searching LDAP by username. | Douwe Maan | 2015-03-06 | 3 | -1/+4 |
* | | | | | | | Merge branch 'issues_url' into 'master' | Dmitriy Zaporozhets | 2015-03-11 | 1 | -12/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove placeholder methods to prevent calling methods rather than attributes. | Marin Jankovski | 2015-03-10 | 1 | -12/+0 |
* | | | | | | | | Merge branch 'dashboard-restyle' into 'master' | Dmitriy Zaporozhets | 2015-03-11 | 28 | -384/+126 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Remove tests for un-existing page | Dmitriy Zaporozhets | 2015-03-10 | 1 | -9/+0 |
| * | | | | | | | Fix tests for project removing | Dmitriy Zaporozhets | 2015-03-10 | 2 | -6/+1 |
| * | | | | | | | Rename dashboard landing page to Your projects | Dmitriy Zaporozhets | 2015-03-10 | 3 | -4/+4 |
| * | | | | | | | Remove projects page from dashboard | Dmitriy Zaporozhets | 2015-03-10 | 6 | -108/+0 |
| * | | | | | | | Add project filter by visibility and tag to explore page | Dmitriy Zaporozhets | 2015-03-10 | 8 | -144/+88 |
| * | | | | | | | Fix test for creating group from dashboard | Dmitriy Zaporozhets | 2015-03-10 | 4 | -27/+27 |
| * | | | | | | | Cleanup after removing group tab from dashboard aside | Dmitriy Zaporozhets | 2015-03-10 | 2 | -40/+0 |
| * | | | | | | | Remove group rendering from dashboard page | Dmitriy Zaporozhets | 2015-03-10 | 6 | -46/+6 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'fix-forms' into 'master' | Dmitriy Zaporozhets | 2015-03-11 | 1 | -16/+24 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Fix features checkboxes at admin settings page | Dmitriy Zaporozhets | 2015-03-10 | 1 | -16/+24 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'active-users-check' into 'master' | Dmitriy Zaporozhets | 2015-03-10 | 2 | -0/+6 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Update CHANGELOG | Dmitriy Zaporozhets | 2015-03-10 | 1 | -0/+1 |
| * | | | | | Add active users to gitlab:check | Dmitriy Zaporozhets | 2015-03-10 | 1 | -0/+5 |
* | | | | | | Add CHANGELOG item about db migration | Dmitriy Zaporozhets | 2015-03-10 | 1 | -0/+1 |
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-03-10 | 6 | -4/+47 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'upgrade-dockerfile' into 'master' | Robert Schilling | 2015-03-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Upgrade Docker image to GitLab v7.8.3 | Stan Hu | 2015-03-10 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'master' into 'master' | Hannes Rosenögger | 2015-03-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | Added a link_to for the LinkedIn portion of the user's profile. It felt odd t... | Ben Carson | 2015-03-10 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'fix-import-redirect' into 'master' | Hannes Rosenögger | 2015-03-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fixing import redirect loop | DJ Mountney | 2015-03-09 | 1 | -1/+1 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'fix-commit-calendar-emails' into 'master' | Douwe Maan | 2015-03-10 | 3 | -1/+44 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | This MR extends the commit calendar so it searches for commits made with ever... | Stan Hu | 2015-03-09 | 3 | -1/+44 |
| | | |_|_|_|/ | | |/| | | | | |||||
* | | | | | | | Merge branch 'fix_importers' into 'master' | Dmitriy Zaporozhets | 2015-03-10 | 4 | -14/+42 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | remove duplication | Valery Sizov | 2015-03-10 | 2 | -2/+23 |
| * | | | | | | | Fix importers with OCC | Valery Sizov | 2015-03-10 | 3 | -14/+21 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'uploads-authorization' into 'master' | Dmitriy Zaporozhets | 2015-03-10 | 3 | -16/+329 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Reject access to group/project avatar if the user doesn't have access. | Douwe Maan | 2015-03-10 | 3 | -16/+329 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'fix-line-highlight' into 'master' | Dmitriy Zaporozhets | 2015-03-10 | 7 | -9/+10 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | |