| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix award tooltip after voting.awardables-merge | Fatih Acet | 2016-05-24 | 1 | -16/+36 |
| | | |||||
| * | Handle thumbsup and thumbsdown mutuality. | Fatih Acet | 2016-05-24 | 1 | -0/+8 |
| | | |||||
| * | Fix variable name because of a wrong resolved merge conflict. | Fatih Acet | 2016-05-23 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'awardables-merge' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Fatih Acet | 2016-05-23 | 2 | -118/+143 |
| |\ | | | | | | | | | | | | | awardables-merge # Conflicts: # app/assets/javascripts/notes.js.coffee | ||||
| | * | minor js fixes | ZJ van de Weg | 2016-05-20 | 3 | -119/+144 |
| | | | |||||
| * | | Fix displaying emoji only comments. | Fatih Acet | 2016-05-23 | 2 | -24/+46 |
| | | | | | | | | | To render emoji in the emoji bar of an issue or MR we actually need the emoji unicode and unicode info is stored in the emoji menu widget. That widget could only be visible if user clicks the "Add" button and there may not be a widget when posting emoji only comments. So this change will check existence of the widget and create it before posting the emoji if it's not exist to render it correctly. | ||||
| * | | Fix emoji counter issue. | Fatih Acet | 2016-05-23 | 1 | -1/+1 |
| |/ | |||||
| * | Add Gitlab namespace AwardEmoji. | Fatih Acet | 2016-05-19 | 1 | -1/+1 |
| | | |||||
| * | Adds the emoji menu to the body and then re-positions it depending on which ↵ | Phil Hughes | 2016-05-19 | 3 | -23/+46 |
| | | | | | | | button clicked This spots bugs where the menu could be in a div that has overflow hidden on ie. diff comments | ||||
| * | Tooltip placement on award buttons | Phil Hughes | 2016-05-19 | 2 | -1/+2 |
| | | |||||
| * | Hides award bar when editing a note | Phil Hughes | 2016-05-19 | 1 | -1/+2 |
| | | |||||
| * | Changed design of inline award picker to be similar to designs | Phil Hughes | 2016-05-19 | 2 | -2/+12 |
| | | | | | | # Conflicts: # app/views/votes/_votes_block.html.haml | ||||
| * | Removed console log | Phil Hughes | 2016-05-19 | 1 | -1/+0 |
| | | |||||
| * | Hides the row in notes body when empty of emojis | Phil Hughes | 2016-05-19 | 1 | -0/+5 |
| | | |||||
| * | Removes buttons in notes body | Phil Hughes | 2016-05-19 | 1 | -26/+30 |
| | | |||||
| * | Shows the bar on notes if a new award is added | Phil Hughes | 2016-05-19 | 1 | -10/+23 |
| | | | | | | | | | | Correctly adds/removes awards in notes # Conflicts: # app/models/concerns/awardable.rb # app/views/projects/issues/show.html.haml # app/views/projects/merge_requests/_show.html.haml | ||||
| * | Uses the same emoji-menu and just moves it around depending where it should ↵ | Phil Hughes | 2016-05-19 | 5 | -159/+137 |
| | | | | | | | | | | | be viewed # Conflicts: # app/assets/javascripts/awards_handler.coffee # app/assets/stylesheets/pages/notes.scss # app/helpers/issues_helper.rb # app/views/projects/notes/_note.html.haml | ||||
| * | Refactored JS slightly to make things easier | Phil Hughes | 2016-05-19 | 1 | -113/+100 |
| | | | | | | | # Conflicts: # app/assets/javascripts/awards_handler.coffee # app/views/emoji_awards/_awards_block.html.haml | ||||
| * | Merge branch 'fix-typo-zen-control' into 'master' | Dmitriy Zaporozhets | 2016-05-18 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Fixed typo in zen.scss and corresponding views See merge request !4045 | ||||
| | * | Fixed typo in zen.scss and corresponding views | Yatish Mehta | 2016-05-04 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'remove-images-from-ci' into 'master' | Rémy Coutable | 2016-05-18 | 6 | -0/+0 |
| |\ \ | | | | | | | | | | | | | | | | | | | Clean up the images from GitLab CI Closes #17568 See merge request !4163 | ||||
| | * | | Clean up the images from GitLab CI | Takuya Noguchi | 2016-05-17 | 6 | -0/+0 |
| | | | | |||||
| * | | | Remove bottom margin for flash message on home page | Carlos Feliciano | 2016-05-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix left sidebar overlap when scroll on long menudz-fix-sidebar-overlap | Dmitriy Zaporozhets | 2016-05-16 | 1 | -0/+2 |
| |/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Change colors for charcoal and graphite sidebar themesdz-change-sidebar-colors | Dmitriy Zaporozhets | 2016-05-14 | 1 | -4/+4 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Extract LegacyDiffNote out of Note | Douwe Maan | 2016-05-13 | 2 | -2/+3 |
| | | | |||||
| * | | Merge branch '17338-sidebar-width' into 'master' | Dmitriy Zaporozhets | 2016-05-13 | 2 | -2/+2 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce width of side nav Closes #17338 Part of #14838 Left: old; Right: new <img src="/uploads/7dba5f22d6bdf1249bab5166addb25b5/Screen_Shot_2016-05-10_at_4.34.07_PM.png" width="500px"> See merge request !4109 | ||||
| | * | | Undo changes; reduce sidebar internal width17338-sidebar-width | Annabel Dunstone | 2016-05-12 | 1 | -9/+4 |
| | | | | |||||
| | * | | No extra link padding at xs screen size | Annabel Dunstone | 2016-05-10 | 1 | -2/+4 |
| | | | | |||||
| | * | | Reduce width of side nav | Annabel Dunstone | 2016-05-10 | 2 | -5/+8 |
| | | | | |||||
| * | | | Merge branch '17501-dropdown-bug' into 'master' | Dmitriy Zaporozhets | 2016-05-13 | 1 | -0/+19 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mobile dropdown bug Closes #17501  See merge request !4142 | ||||
| | * | | | Fix mobile dropdown bug | Annabel Dunstone | 2016-05-13 | 1 | -0/+19 |
| | | | | | |||||
| * | | | | Fix login btn vertical align | Dmitriy Zaporozhets | 2016-05-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | Fix issue sidebar top position after header height change | Dmitriy Zaporozhets | 2016-05-13 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | Remove background color differentiation from gitlab logo/text in sidebardz-improve-sidebar-design | Dmitriy Zaporozhets | 2016-05-13 | 1 | -4/+1 |
| |/ / / | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Merge branch 'send-incremental-build-log' into 'master' | Jacob Schatz | 2016-05-12 | 1 | -7/+14 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update build log incrementally Proof of concept implementation of incremental sending of build log to browser. cc @jschatz1 @vsizov @grzesiek @tmaczukin See merge request !3737 | ||||
| | * \ \ | Merge remote-tracking branch 'origin/master' into send-incremental-build-log | Kamil Trzcinski | 2016-05-10 | 10 | -42/+115 |
| | |\ \ \ | |||||
| | * | | | | Encode state as base64 string | Kamil Trzcinski | 2016-05-09 | 1 | -7/+14 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Long Nguyen | 2016-05-11 | 11 | -42/+119 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | issue_15572_snippets_tab_under_user_profile | ||||
| | * | | | | Merge branch 'fix-r-shortcut' into 'master' | Jacob Schatz | 2016-05-10 | 1 | -0/+4 |
| | |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | Restore "r" shortcut Fixes "Reply with Selected Text" shortcut See merge request !4041 | ||||
| | | * | | | Restore "r" shortcutfix-r-shortcut | Alfredo Sumaran | 2016-05-04 | 1 | -0/+4 |
| | | | |/ | | |/| | |||||
| | * | | | Merge branch 'fix/remove-broken-inline-runner-desc-edit' into 'master' | Robert Speicher | 2016-05-10 | 1 | -28/+0 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove broken inline runner description edit form This remove inline form for editing runnner's description. It is broken because of missing partial / incorrect response and it also does not make much sense, since we have under 'Edit' button a form that makes it possible to edit more than just a description. See merge request !4095 | ||||
| | | * | | | Remove broken inline runner description edit form | Grzegorz Bizon | 2016-05-09 | 1 | -28/+0 |
| | | | | | | |||||
| | * | | | | Change dashboard button color to white on hover | Dmitriy Zaporozhets | 2016-05-10 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | Minor consistency fixes to sidebar & header | Dmitriy Zaporozhets | 2016-05-10 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | Fix media queries for absolutely positioned nav element | Annabel Dunstone | 2016-05-09 | 3 | -4/+14 |
| | | | | | | |||||
| | * | | | | Hide navbar on mobile | Annabel Dunstone | 2016-05-09 | 6 | -5/+91 |
| | |/ / / | |||||
| | * | | | Fix build notification on merge request page change even if the build status ↵ | Benedikt Huss | 2016-05-08 | 1 | -4/+5 |
| | | |/ | |/| | | | | | | | didn't change | ||||
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Long Nguyen | 2016-05-08 | 19 | -23/+219 |
| |\ \ \ | |/ / | | | | | | | issue_15572_snippets_tab_under_user_profile | ||||
| | * | | Merge branch 'nice-todos-bell' into 'master' | Dmitriy Zaporozhets | 2016-05-06 | 2 | -1/+9 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add nice new Todo bell    Fixes: #15671 See merge request !4077 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |