summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* notification on project movingnotification_on_project_movingValery Sizov2015-03-251-0/+3
* 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
| | |_|/ | |/| |
* | | | Merge branch 'update-changelog' into 'master'Robert Schilling2015-03-241-2/+1
|\ \ \ \
| * | | | Remove duplicate CHANGELOG items for v7.8.0Aurelio Jargas2015-03-241-2/+1
| | |/ / | |/| |
* | | | Merge branch 'fix-nested-tasks' into 'master'Dmitriy Zaporozhets2015-03-244-3/+16
|\ \ \ \ | |/ / / |/| | |
| * | | Update CHANGELOGVinnie Okada2015-03-221-0/+1
| * | | Fix nested task listsVinnie Okada2015-03-213-3/+15
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-233-9/+13
|\ \ \ \
| * \ \ \ Merge branch 'merge-status-without-timestamps' into 'master'Dmitriy Zaporozhets2015-03-243-9/+13
| |\ \ \ \
| | * | | | Don't mark merge request as updated when merge status relative to target bran...merge-status-without-timestampsDouwe Maan2015-03-233-9/+13
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-2311-22/+31
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Merge branch 'notes-count-without-system' into 'master'Dmitriy Zaporozhets2015-03-247-7/+11
| |\ \ \ \
| | * | | | Don't include system notes in issue/MR comment count.notes-count-without-systemDouwe Maan2015-03-237-7/+11
| | |/ / /
| * | | | Merge branch 'improve-diff-header' into 'master'Dmitriy Zaporozhets2015-03-242-11/+12
| |\ \ \ \
| | * | | | Fix file mode going to next line in diff headerimprove-diff-headerDmitriy Zaporozhets2015-03-232-11/+12
| | |/ / /
| * | | | Merge branch 'keyword-args-2.0' into 'master'Douwe Maan2015-03-232-4/+8
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Revert "Update gemnasium-gitlab-service gem"Douwe Maan2015-03-231-1/+1
| | * | | Don't use required keyword arguments to maintain support for Ruby 2.0.Douwe Maan2015-03-231-3/+7
| |/ / /
* | | | Merge pull request #9006 from hebbet/patch-1Robert Schilling2015-03-231-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Change comment in blue ui to match other scsshebbet2015-03-231-1/+1
|/ / /
* | | Merge branch 'emailsonpush-create-delete' into 'master'Dmitriy Zaporozhets2015-03-237-134/+283
|\ \ \
| * | | Clean up code by using keyword arguments.Douwe Maan2015-03-234-16/+28
| * | | Send EmailsOnPush email when branch or tag is created or deleted.Douwe Maan2015-03-187-127/+262
* | | | Merge branch 'no-comment-bubble' into 'master'Dmitriy Zaporozhets2015-03-232-1/+2
|\ \ \ \