summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | Merge branch 'master' into awardablesZJ van de Weg2016-05-25469-1642/+9023
| | | |\ \ \ \ \ \ \ \
| | * | | | | | | | | | " :arrow_right: '.Fatih Acet2016-05-251-41/+44
| | |/ / / / / / / / /
| | * | | | | | | | | Handle posting emoji only vote +1 and -1 comments.Fatih Acet2016-05-241-24/+30
| | * | | | | | | | | Get award menu url from gl object.Fatih Acet2016-05-243-1/+7
| | * | | | | | | | | Fix award tooltip after voting.awardables-mergeFatih Acet2016-05-241-16/+36
| | * | | | | | | | | Handle thumbsup and thumbsdown mutuality.Fatih Acet2016-05-241-0/+8
| | * | | | | | | | | Fix variable name because of a wrong resolved merge conflict.Fatih Acet2016-05-231-2/+2
| | * | | | | | | | | Merge branch 'awardables-merge' of gitlab.com:gitlab-org/gitlab-ce into award...Fatih Acet2016-05-233-131/+150
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | minor js fixesZJ van de Weg2016-05-204-132/+151
| | * | | | | | | | | | Fix displaying emoji only comments.Fatih Acet2016-05-232-24/+46
| | * | | | | | | | | | Fix emoji counter issue.Fatih Acet2016-05-231-1/+1
| | |/ / / / / / / / /
| | * | | | | | | | | Fix backend merge mistakesZJ van de Weg2016-05-193-4/+2
| | * | | | | | | | | Add Gitlab namespace AwardEmoji.Fatih Acet2016-05-191-1/+1
| | * | | | | | | | | Adds the emoji menu to the body and then re-positions it depending on which b...Phil Hughes2016-05-196-38/+59
| | * | | | | | | | | Award spec for merge requestsPhil Hughes2016-05-191-0/+140
| | * | | | | | | | | Added tests for issuesPhil Hughes2016-05-192-3/+143
| | * | | | | | | | | Tooltip placement on award buttonsPhil Hughes2016-05-193-2/+3
| | * | | | | | | | | Hides award bar when editing a notePhil Hughes2016-05-191-1/+2
| | * | | | | | | | | Changed design of inline award picker to be similar to designsPhil Hughes2016-05-194-33/+14
| | * | | | | | | | | Removed console logPhil Hughes2016-05-191-1/+0
| | * | | | | | | | | Hides the row in notes body when empty of emojisPhil Hughes2016-05-191-0/+5
| | * | | | | | | | | Removes buttons in notes bodyPhil Hughes2016-05-191-26/+30
| | * | | | | | | | | Shows the bar on notes if a new award is addedPhil Hughes2016-05-193-17/+31
| | * | | | | | | | | Uses the same emoji-menu and just moves it around depending where it should b...Phil Hughes2016-05-197-178/+155
| | * | | | | | | | | Refactored JS slightly to make things easierPhil Hughes2016-05-192-113/+122
| | * | | | | | | | | Merge branch 'awardables' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-1810-66/+23
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix latests concernsZJ van de Weg2016-05-1810-66/+23
| | * | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-1841-22/+954
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-18260-1175/+3444
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Fix tests and wrong choices during mergeZeger-Jan van de Weg2016-05-127-12/+58
| | * | | | | | | | | | | revert front end changesZeger-Jan van de Weg2016-05-116-236/+147
| | * | | | | | | | | | | Incorporate feedbackZeger-Jan van de Weg2016-05-1115-97/+23
| | * | | | | | | | | | | Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-1145-375/+743
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | merge awards-handler.coffee from another branchZeger-Jan van de Weg2016-05-111-49/+48
| | * | | | | | | | | | | | Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-11810-6352/+13036
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add tests on Awardables and Award EmojiZeger-Jan van de Weg2016-05-1018-56/+181
| | * | | | | | | | | | | | | move frontend logic from previous MR to new MRArinde Eniola2016-05-068-102/+192
| | * | | | | | | | | | | | | Create table for award emojiZeger-Jan van de Weg2016-05-0641-307/+446
| * | | | | | | | | | | | | | Merge branch 'dz-rename-registry-tab' into 'master' Dmitriy Zaporozhets2016-06-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Shorter name for Container Registry tabdz-rename-registry-tabDmitriy Zaporozhets2016-06-021-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Fix tests offenses: use `pipeline` of Ci::Build and rename viewsKamil Trzcinski2016-06-0611-44/+44
* | | | | | | | | | | | | | Fix merge_request handlingKamil Trzcinski2016-06-031-1/+1
* | | | | | | | | | | | | | Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commitKamil Trzcinski2016-06-0321-22/+270
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch 'patch-1' into 'master' Douwe Maan2016-06-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Let contributors know where to start Zeger-Jan van de Weg2016-06-031-1/+1
| * | | | | | | | | | | | | | Merge branch 'gh-branch-cleanup' into 'master' Douwe Maan2016-06-032-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Ensure branch cleanup regardless of whether the import process succeedsgh-branch-cleanupDouglas Barbosa Alexandre2016-06-022-2/+5
| * | | | | | | | | | | | | | | Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master' Douwe Maan2016-06-0310-5/+129
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | fixup! Don't allow merges with new commits14139-sha-parameter-in-accept-merge-request-apiSean McGivern2016-06-021-2/+2
| | * | | | | | | | | | | | | | | fixup! Add `sha` parameter to MR accept APISean McGivern2016-06-021-1/+1
View Lorry Controller Status