summaryrefslogtreecommitdiff
path: root/app
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-256-6/+6
|\
| * Refactor GitAccess to use instance variables.Douwe Maan2015-03-246-6/+6
* | 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-242-3/+6
|\ \ \ \
| * | | | Link note avatar to user.note-avatar-linkDouwe Maan2015-03-242-3/+6
| | |_|/ | |/| |
* | | | 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
| |/ / /
* | | | 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 'unset-assignee' into 'master'Dmitriy Zaporozhets2015-03-245-20/+12
|\ \ \ \
| * | | | Make sure issue assignee is properly reset.Douwe Maan2015-03-245-20/+12
| | |/ / | |/| |
* | | | Merge branch 'fix-nested-tasks' into 'master'Dmitriy Zaporozhets2015-03-241-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix nested task listsVinnie Okada2015-03-211-1/+1
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-232-9/+12
|\ \ \ \
| * \ \ \ Merge branch 'merge-status-without-timestamps' into 'master'Dmitriy Zaporozhets2015-03-242-9/+12
| |\ \ \ \
| | * | | | Don't mark merge request as updated when merge status relative to target bran...merge-status-without-timestampsDouwe Maan2015-03-232-9/+12
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-238-20/+28
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Merge branch 'notes-count-without-system' into 'master'Dmitriy Zaporozhets2015-03-245-6/+9
| |\ \ \ \
| | * | | | Don't include system notes in issue/MR comment count.notes-count-without-systemDouwe Maan2015-03-235-6/+9
| | |/ / /
| * | | | 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
| | |/ / /
| * | | | Don't use required keyword arguments to maintain support for Ruby 2.0.Douwe Maan2015-03-231-3/+7
| | |_|/ | |/| |
* | | | Change comment in blue ui to match other scsshebbet2015-03-231-1/+1
|/ / /
* | | Merge branch 'emailsonpush-create-delete' into 'master'Dmitriy Zaporozhets2015-03-235-132/+184
|\ \ \
| * | | Clean up code by using keyword arguments.Douwe Maan2015-03-233-10/+22
| * | | Send EmailsOnPush email when branch or tag is created or deleted.Douwe Maan2015-03-185-125/+165
* | | | Merge branch 'no-comment-bubble' into 'master'Dmitriy Zaporozhets2015-03-231-1/+1
|\ \ \ \
| * | | | Don't show commit comment button when user is not signed in.Douwe Maan2015-03-231-1/+1
| | |/ / | |/| |
* | | | Merge branch 'userpage-activity-scroll'Dmitriy Zaporozhets2015-03-233-7/+22
|\ \ \ \
| * | | | Fix atom feed for user pageuserpage-activity-scrollDmitriy Zaporozhets2015-03-221-1/+6
| * | | | Add inifinite scroll to user activity on user pageDmitriy Zaporozhets2015-03-223-6/+16
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-2312-150/+69
|\ \ \ \ \
| * \ \ \ \ Merge branch 'improve-contributions-calendar' into 'master'Dmitriy Zaporozhets2015-03-2310-149/+53
| |\ \ \ \ \
| | * | | | | Improve contribution calendar per day infoDmitriy Zaporozhets2015-03-223-28/+3
| | * | | | | Contribution calendar will use events instead of commits to count contributionsDmitriy Zaporozhets2015-03-221-1/+4
| | * | | | | Refactor contributions events and write tests for calendarDmitriy Zaporozhets2015-03-224-12/+13
| | * | | | | Replace commits calendar with contributions calendarDmitriy Zaporozhets2015-03-216-114/+39
| | |/ / / /
| * | | | | Merge branch 'fix-admin-service-template-config' into 'master'Douwe Maan2015-03-232-1/+16
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Include missing events and fix save functionality in admin service template s...Stan Hu2015-03-232-1/+16
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-232-10/+16
|\ \ \ \ \ \
| * | | | | | Fix #8966 Remove Milestones/Labels from project navbar when Isses disabledvichak2015-03-232-2/+6
| * | | | | | Fix #8966 Remove Milestones ans Labels from project navbar when Issues disabledvichak2015-03-231-10/+12
| |/ / / / /
* | | | | | Merge branch 'your' into 'master'Dmitriy Zaporozhets2015-03-2314-19/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | |