summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Prevent doubling AJAX request with each commit visit via Turbolinkfix-branch-containsDmitriy Zaporozhets2015-03-252-2/+2
* Merge pull request #9021 from nicklegr/faster_auto_mergeDmitriy Zaporozhets2015-03-252-5/+2
|\
| * Update CHANGELOGnicklegr2015-03-251-0/+1
| * Reset parking branch to HEAD everytimenicklegr2015-03-251-5/+1
* | Merge pull request #8007 from mr-vinn/markdown-tagsDmitriy Zaporozhets2015-03-255-10/+58
|\ \
| * \ Merge branch 'master' into markdown-tagsVinnie Okada2015-03-2485-530/+829
| |\ \
| * \ \ Merge branch 'master' into markdown-tagsVinnie Okada2015-03-2246-141/+466
| |\ \ \
| * | | | Fix SanitizationFilter bugsVinnie Okada2015-03-221-1/+2
| * | | | Merge branch 'master' into markdown-tagsVinnie Okada2015-03-21131-1414/+1117
| |\ \ \ \
| * | | | | Don't allow style attributes in inline HTMLVinnie Okada2015-03-212-1/+2
| * | | | | Change HTML sanitizationVinnie Okada2015-03-193-72/+25
| * | | | | Merge branch 'master' into markdown-tagsVinnie Okada2015-03-171442-16375/+37368
| |\ \ \ \ \
| * | | | | | Document whitelisted HTML tags and attributesVinnie Okada2014-10-101-0/+59
| * | | | | | Allow HTML tags in user Markdown inputVinnie Okada2014-10-103-2/+36
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-2512-25/+29
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge branch 'more-rubocop-styles' into 'master'Dmitriy Zaporozhets2015-03-2511-22/+25
| |\ \ \ \ \ \
| | * | | | | | Style/RedundantReturn enabledmore-rubocop-stylesDmitriy Zaporozhets2015-03-247-10/+13
| | * | | | | | Enable more rubocop style checksDmitriy Zaporozhets2015-03-246-13/+13
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'master' into 'master'Hannes Rosenögger2015-03-251-3/+4
| |\ \ \ \ \ \
| | * | | | | | how to render line-breaksDmitri Goosens2014-09-171-3/+4
* | | | | | | | Fix changelog for 7.9Robert Schilling2015-03-251-3/+1
* | | | | | | | Merge pull request #8988 from atomaka/atomaka/bugfix/gitlab-shell-taskRobert Schilling2015-03-251-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix newline spacing after authorized_keys rebuildAndrew Tomaka2015-03-201-0/+1
* | | | | | | | Merge branch 'api-internal-errors' into 'master'Dmitriy Zaporozhets2015-03-2514-94/+134
|\ \ \ \ \ \ \ \
| * | | | | | | | Respond with full GitAccess error if user has project read access.api-internal-errorsDouwe Maan2015-03-242-1/+2
| * | | | | | | | Refactor GitAccess to use instance variables.Douwe Maan2015-03-2413-93/+132
* | | | | | | | | Merge branch 'fix-sticky-header' into 'master'Dmitriy Zaporozhets2015-03-252-7/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Improve sticky headers in diffsfix-sticky-headerDmitriy Zaporozhets2015-03-242-7/+7
|/ / / / / / / /
* | | | | | | | Merge branch 'milestone_and_labels_links' into 'master'Dmitriy Zaporozhets2015-03-252-6/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Milestones and labels can be used even when issues are disabled.Marin Jankovski2015-03-242-6/+7
* | | | | | | | | Merge branch 'mr-button-color' into 'master'Dmitriy Zaporozhets2015-03-242-18/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change merge request button color based on CI statusDmitriy Zaporozhets2015-03-242-18/+12
* | | | | | | | | | Merge branch 'note-avatar-link' into 'master'Dmitriy Zaporozhets2015-03-243-3/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Link note avatar to user.note-avatar-linkDouwe Maan2015-03-243-3/+7
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'user-subscriptions-dependent' into 'master'Dmitriy Zaporozhets2015-03-241-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Clean up subscriptions when user is deleted.user-subscriptions-dependentDouwe Maan2015-03-241-0/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'update-rugments' into 'master'Dmitriy Zaporozhets2015-03-241-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update rugments to 1.0.0.beta6 to fix C# highlighting.update-rugmentsDouwe Maan2015-03-241-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-241-1/+2
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #9012 from dantudor/patch-1Dmitriy Zaporozhets2015-03-241-1/+2
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Unescape branch param to deleteDan Tudor2015-03-241-1/+2
| | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | Fix diff header in discussion blocksDmitriy Zaporozhets2015-03-241-7/+7
|/ / / / / / / / /
* | | | | | | | | Merge pull request #9007 from atomaka/atomaka/feature/broadcast-message-colorsDmitriy Zaporozhets2015-03-242-6/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update help texts and default value settingAndrew Tomaka2015-03-242-6/+4
| * | | | | | | | | Update broadcast messages to use color_fieldAndrew Tomaka2015-03-231-2/+2
* | | | | | | | | | Merge branch 'git-auth-rack-attack-improvements' into 'master'Dmitriy Zaporozhets2015-03-247-15/+153
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Reduce Rack Attack false positives by clearing out auth failure count uponStan Hu2015-03-247-15/+153
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'unset-assignee' into 'master'Dmitriy Zaporozhets2015-03-247-21/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add migration.unset-assigneeDouwe Maan2015-03-242-1/+7
| * | | | | | | | | | Make sure issue assignee is properly reset.Douwe Maan2015-03-245-20/+12
| | |_|/ / / / / / / | |/| | | | | | | |