Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into 'master' | Hannes Rosenögger | 2015-03-25 | 1 | -3/+4 |
|\ | |||||
| * | how to render line-breaks | Dmitri Goosens | 2014-09-17 | 1 | -3/+4 |
* | | Merge branch 'api-internal-errors' into 'master' | Dmitriy Zaporozhets | 2015-03-25 | 14 | -94/+134 |
|\ \ | |||||
| * | | Respond with full GitAccess error if user has project read access.api-internal-errors | Douwe Maan | 2015-03-24 | 2 | -1/+2 |
| * | | Refactor GitAccess to use instance variables. | Douwe Maan | 2015-03-24 | 13 | -93/+132 |
* | | | Merge branch 'fix-sticky-header' into 'master' | Dmitriy Zaporozhets | 2015-03-25 | 2 | -7/+7 |
|\ \ \ | |||||
| * | | | Improve sticky headers in diffsfix-sticky-header | Dmitriy Zaporozhets | 2015-03-24 | 2 | -7/+7 |
|/ / / | |||||
* | | | Merge branch 'milestone_and_labels_links' into 'master' | Dmitriy Zaporozhets | 2015-03-25 | 2 | -6/+7 |
|\ \ \ | |||||
| * | | | Milestones and labels can be used even when issues are disabled. | Marin Jankovski | 2015-03-24 | 2 | -6/+7 |
* | | | | Merge branch 'mr-button-color' into 'master' | Dmitriy Zaporozhets | 2015-03-24 | 2 | -18/+12 |
|\ \ \ \ | |||||
| * | | | | Change merge request button color based on CI status | Dmitriy Zaporozhets | 2015-03-24 | 2 | -18/+12 |
* | | | | | Merge branch 'note-avatar-link' into 'master' | Dmitriy Zaporozhets | 2015-03-24 | 3 | -3/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Link note avatar to user.note-avatar-link | Douwe Maan | 2015-03-24 | 3 | -3/+7 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'user-subscriptions-dependent' into 'master' | Dmitriy Zaporozhets | 2015-03-24 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Clean up subscriptions when user is deleted.user-subscriptions-dependent | Douwe Maan | 2015-03-24 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'update-rugments' into 'master' | Dmitriy Zaporozhets | 2015-03-24 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Update rugments to 1.0.0.beta6 to fix C# highlighting.update-rugments | Douwe Maan | 2015-03-24 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-03-24 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #9012 from dantudor/patch-1 | Dmitriy Zaporozhets | 2015-03-24 | 1 | -1/+2 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Unescape branch param to delete | Dan Tudor | 2015-03-24 | 1 | -1/+2 |
| | | |/ / | | |/| | | |||||
* | | | | | Fix diff header in discussion blocks | Dmitriy Zaporozhets | 2015-03-24 | 1 | -7/+7 |
|/ / / / | |||||
* | | | | Merge pull request #9007 from atomaka/atomaka/feature/broadcast-message-colors | Dmitriy Zaporozhets | 2015-03-24 | 2 | -6/+4 |
|\ \ \ \ | |||||
| * | | | | Update help texts and default value setting | Andrew Tomaka | 2015-03-24 | 2 | -6/+4 |
| * | | | | Update broadcast messages to use color_field | Andrew Tomaka | 2015-03-23 | 1 | -2/+2 |
* | | | | | Merge branch 'git-auth-rack-attack-improvements' into 'master' | Dmitriy Zaporozhets | 2015-03-24 | 7 | -15/+153 |
|\ \ \ \ \ | |||||
| * | | | | | Reduce Rack Attack false positives by clearing out auth failure count upon | Stan Hu | 2015-03-24 | 7 | -15/+153 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'unset-assignee' into 'master' | Dmitriy Zaporozhets | 2015-03-24 | 7 | -21/+19 |
|\ \ \ \ \ | |||||
| * | | | | | Add migration.unset-assignee | Douwe Maan | 2015-03-24 | 2 | -1/+7 |
| * | | | | | Make sure issue assignee is properly reset. | Douwe Maan | 2015-03-24 | 5 | -20/+12 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'update-changelog' into 'master' | Robert Schilling | 2015-03-24 | 1 | -2/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Remove duplicate CHANGELOG items for v7.8.0 | Aurelio Jargas | 2015-03-24 | 1 | -2/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'fix-nested-tasks' into 'master' | Dmitriy Zaporozhets | 2015-03-24 | 4 | -3/+16 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Update CHANGELOG | Vinnie Okada | 2015-03-22 | 1 | -0/+1 |
| * | | | | Fix nested task lists | Vinnie Okada | 2015-03-21 | 3 | -3/+15 |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-03-23 | 3 | -9/+13 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'merge-status-without-timestamps' into 'master' | Dmitriy Zaporozhets | 2015-03-24 | 3 | -9/+13 |
| |\ \ \ \ \ | |||||
| | * | | | | | Don't mark merge request as updated when merge status relative to target bran...merge-status-without-timestamps | Douwe Maan | 2015-03-23 | 3 | -9/+13 |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-03-23 | 11 | -22/+31 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Merge branch 'notes-count-without-system' into 'master' | Dmitriy Zaporozhets | 2015-03-24 | 7 | -7/+11 |
| |\ \ \ \ \ | |||||
| | * | | | | | Don't include system notes in issue/MR comment count.notes-count-without-system | Douwe Maan | 2015-03-23 | 7 | -7/+11 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'improve-diff-header' into 'master' | Dmitriy Zaporozhets | 2015-03-24 | 2 | -11/+12 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix file mode going to next line in diff headerimprove-diff-header | Dmitriy Zaporozhets | 2015-03-23 | 2 | -11/+12 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'keyword-args-2.0' into 'master' | Douwe Maan | 2015-03-23 | 2 | -4/+8 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | Revert "Update gemnasium-gitlab-service gem" | Douwe Maan | 2015-03-23 | 1 | -1/+1 |
| | * | | | | Don't use required keyword arguments to maintain support for Ruby 2.0. | Douwe Maan | 2015-03-23 | 1 | -3/+7 |
| |/ / / / | |||||
* | | | | | Merge pull request #9006 from hebbet/patch-1 | Robert Schilling | 2015-03-23 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Change comment in blue ui to match other scss | hebbet | 2015-03-23 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge branch 'emailsonpush-create-delete' into 'master' | Dmitriy Zaporozhets | 2015-03-23 | 7 | -134/+283 |
|\ \ \ \ | |||||
| * | | | | Clean up code by using keyword arguments. | Douwe Maan | 2015-03-23 | 4 | -16/+28 |
| * | | | | Send EmailsOnPush email when branch or tag is created or deleted. | Douwe Maan | 2015-03-18 | 7 | -127/+262 |