summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge branch 'atom-xhtml-squashed' into 'master'Douwe Maan2015-03-178-19/+55
| |\
| | * Fix invalid Atom feeds when using emoji, horizontal rules, or images.Christian Walther2015-03-168-19/+53
* | | Merge branch 'last-deploy-key' into 'master'Dmitriy Zaporozhets2015-03-174-2/+44
|\ \ \
| * | | Satisfy Rubocop.Douwe Maan2015-03-171-2/+1
| * | | Delete deploy key when last connection to a project is destroyed.Douwe Maan2015-03-174-2/+45
| |/ /
* | | Merge branch 'issue_subscription' into 'master'Dmitriy Zaporozhets2015-03-1717-4/+245
|\ \ \ | |/ / |/| |
| * | improve UIValery Sizov2015-03-175-22/+30
| * | testsValery Sizov2015-03-1615-25/+115
| * | fix specsValery Sizov2015-03-163-12/+22
| * | rename table subscribe; make it polymorficValery Sizov2015-03-1611-44/+41
| * | update changelogValery Sizov2015-03-161-0/+1
| * | code folding fixValery Sizov2015-03-165-8/+19
| * | SubscriptionValery Sizov2015-03-1511-3/+127
* | | Properly align save user profile buttonDmitriy Zaporozhets2015-03-171-2/+4
* | | Revert "Merge branch 'backup-permissions' into 'master'"Dmitriy Zaporozhets2015-03-163-48/+7
* | | Fix button color inside alertDmitriy Zaporozhets2015-03-161-1/+1
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-161-1/+1
|\ \ \
| * \ \ Merge branch 'relative-sematic-versioning' into 'master'Dmitriy Zaporozhets2015-03-171-1/+1
| |\ \ \
| | * | | Add note about semantic versioning not being absolute.relative-sematic-versioningSytse Sijbrandij2015-01-101-1/+1
* | | | | Merge branch 'backup-permissions' into 'master'Dmitriy Zaporozhets2015-03-173-7/+48
|\ \ \ \ \
| * | | | | Change permissions on backup filesVinnie Okada2015-03-153-7/+48
* | | | | | Merge branch 'unicorn-workers' into 'master'Dmitriy Zaporozhets2015-03-171-1/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Documentation about unicorn settings.Sytse Sijbrandij2015-03-161-1/+4
* | | | | | Merge branch 'fix-null-visibility' into 'master'Dmitriy Zaporozhets2015-03-173-5/+9
|\ \ \ \ \ \
| * | | | | | Fix restricted visibility bugsVinnie Okada2015-03-162-4/+8
| * | | | | | Handle null restricted_visibility_levels settingVinnie Okada2015-03-161-1/+1
| |/ / / / /
* | | | | | Merge branch 'dependency_to_documentation' into 'master'Marin Jankovski2015-03-163-2/+122
|\ \ \ \ \ \
| * | | | | | Add nodejs dependency to upgrader and upgrade from 7.7 docsMarin Jankovski2015-03-162-1/+121
| * | | | | | Add nodejs to installation doc.Marin Jankovski2015-03-161-1/+1
* | | | | | | Merge branch 'remove_rubyracer' into 'master'Marin Jankovski2015-03-162-7/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove rubyracer gem.remove_rubyracerMarin Jankovski2015-03-132-7/+0
* | | | | | | Fix editor UI bugDmitriy Zaporozhets2015-03-161-2/+0
| |/ / / / / |/| | | | |
* | | | | | Remove ugly highlight stylesDmitriy Zaporozhets2015-03-161-5/+0
* | | | | | Bump gitlab-shell versionDmitriy Zaporozhets2015-03-161-1/+1
* | | | | | Merge branch 'post-receive-base64' into 'master'Dmitriy Zaporozhets2015-03-165-10/+30
|\ \ \ \ \ \
| * | | | | | Prevent gitlab-shell character encoding issues by receiving its changes as ra...Douwe Maan2015-03-155-10/+30
* | | | | | | Merge branch 'montly_doc_with_next_release_blog_article' into 'master'Dmitriy Zaporozhets2015-03-161-4/+8
|\ \ \ \ \ \ \
| * | | | | | | Update monthly doc to mention wip blogpost for next release.Marin Jankovski2015-03-131-4/+8
* | | | | | | | Merge branch 'fix-restricted-visibility' into 'master'Dmitriy Zaporozhets2015-03-1633-104/+370
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into fix-restricted-visibilityVinnie Okada2015-03-14321-1661/+3476
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add tests for snippet servicesVinnie Okada2015-03-142-0/+96
| * | | | | | | | | Update snippet authorizationVinnie Okada2015-03-141-2/+4
| * | | | | | | | | More restricted visibility changesVinnie Okada2015-03-102-5/+6
| * | | | | | | | | Enforce restricted visibilities for snippetsVinnie Okada2015-03-0812-63/+76
| * | | | | | | | | Allow admins to override restricted visibilityVinnie Okada2015-03-0811-20/+95
| * | | | | | | | | Move restricted visibility settings to the UIVinnie Okada2015-03-0716-49/+128
* | | | | | | | | | Merge branch 'fix-typos' into 'master'Hannes Rosenögger2015-03-162-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix typo in CHANGELOG and add creditStan Hu2015-03-161-1/+1
| * | | | | | | | | | Fix typo for HipChat doc: messaging, not messageStan Hu2015-03-161-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'add-hipchat-doc' into 'master'Hannes Rosenögger2015-03-163-1/+56
|\ \ \ \ \ \ \ \ \ \