| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add margin to pages where is no headerremove-gray-bg | Dmitriy Zaporozhets | 2016-01-14 | 4 | -4/+4 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Update files/diffs to match new layout | Dmitriy Zaporozhets | 2016-01-14 | 12 | -17/+26 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Fix files, project settings and few more pages with new layout | Dmitriy Zaporozhets | 2016-01-14 | 7 | -7/+18 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Fix tests | Dmitriy Zaporozhets | 2016-01-13 | 1 | -2/+2 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Add CHANGELOG item | Dmitriy Zaporozhets | 2016-01-13 | 1 | -0/+3 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Use closest instead of parent() | Dmitriy Zaporozhets | 2016-01-13 | 1 | -1/+1 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Dont use nav-pills. Instead use nav-lists | Dmitriy Zaporozhets | 2016-01-13 | 4 | -109/+94 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Replace nav-tabs with nav-links | Dmitriy Zaporozhets | 2016-01-13 | 11 | -79/+13 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Add top margin for page title | Dmitriy Zaporozhets | 2016-01-13 | 1 | -1/+1 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Apply new layout to user page | Dmitriy Zaporozhets | 2016-01-13 | 4 | -69/+72 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Allign md header components | Dmitriy Zaporozhets | 2016-01-13 | 2 | -8/+1 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Increase detail-page-header padding to match height with nav-link | Dmitriy Zaporozhets | 2016-01-13 | 1 | -1/+1 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Update UI help page with only one nav-link example | Dmitriy Zaporozhets | 2016-01-13 | 1 | -17/+0 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Replace all navigation menu with nav-links class | Dmitriy Zaporozhets | 2016-01-13 | 38 | -73/+80 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Start moving all navigation to one class | Dmitriy Zaporozhets | 2016-01-13 | 8 | -137/+41 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | New layout without background color | Dmitriy Zaporozhets | 2016-01-13 | 18 | -60/+63 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Add suport for layout without container | Dmitriy Zaporozhets | 2016-01-13 | 1 | -1/+1 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Merge branch 'referenced-merge-requests' into 'master' | Dmitriy Zaporozhets | 2016-01-13 | 6 | -8/+19 |
| |\ | | | | | | | | | | | | | | | | | merge request close message moved and merge request now refered by `!`. Fixes #4161  See merge request !2387 | ||||
| | * | changes `$quote-gray` to `$secondary-text`referenced-merge-requests | Jacob Schatz | 2016-01-12 | 2 | -2/+2 |
| | | | |||||
| | * | makes message plural for multiple MRs and removes from loop. Duh. | Jacob Schatz | 2016-01-12 | 3 | -5/+11 |
| | | | |||||
| | * | merge request close message moved and merge request now refered by `!`. | Jacob Schatz | 2016-01-12 | 5 | -6/+11 |
| | | | |||||
| * | | Merge branch 'rs-disable-colorization' into 'master' | Dmitriy Zaporozhets | 2016-01-13 | 2 | -1/+3 |
| |\ \ | | | | | | | | | | | | | | | | | | | Disable colorization if STDOUT is not a tty Closes #6118 See merge request !2403 | ||||
| | * | | Don't automatically require awesome_printrs-disable-colorization | Robert Speicher | 2016-01-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | It patches core classes (such as String) to add colorization methods like `red` which we can't disable the same way we can with the Colorization gem. | ||||
| | * | | Disable colorization if STDOUT is not a tty | Robert Speicher | 2016-01-12 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge branch 'rs-block-user-before-removal' into 'master' | Dmitriy Zaporozhets | 2016-01-13 | 3 | -4/+23 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Block the reported user before destroying the record This is intended to prevent the user from creating new objects while the transaction that removes them is being run, resulting in objects with nil authors which can then not be edited. See https://gitlab.com/gitlab-org/gitlab-ce/issues/7117 See merge request !2402 | ||||
| | * | | | Block the reported user before destroying the recordrs-block-user-before-removal | Robert Speicher | 2016-01-12 | 3 | -4/+23 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | This is intended to prevent the user from creating new objects while the transaction that removes them is being run, resulting in objects with nil authors which can then not be edited. See https://gitlab.com/gitlab-org/gitlab-ce/issues/7117 | ||||
| * | | | Merge branch 'rs-time_ago_with_tooltip-conversion' into 'master' | Dmitriy Zaporozhets | 2016-01-13 | 2 | -1/+5 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure time_ago_with_tooltip is using a Time object Somehow this test existed on EE but not in CE, so it started failing after a bad CE-to-EE merge. See merge request !2398 | ||||
| | * | | | Make sure time_ago_with_tooltip is using a Time objectrs-time_ago_with_tooltip-conversion | Robert Speicher | 2016-01-12 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | Somehow this test existed on EE but not in CE, so it started failing after a bad CE-to-EE merge. | ||||
| * | | | | Merge branch 'comment-and-close-button-does-not-submit-comment' into 'master' | Dmitriy Zaporozhets | 2016-01-13 | 6 | -22/+38 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comment and close button does not submit comment See merge request !2399 | ||||
| | * | | | | gets merge request discussion working againcomment-and-close-button-does-not-submit-comment | Jacob Schatz | 2016-01-12 | 3 | -4/+24 |
| | | | | | | |||||
| | * | | | | adds back in discussion.haml.html for issues commenting and ↵ | Jacob Schatz | 2016-01-12 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | closing/reopening properly. | ||||
| | * | | | | removing last chunk of MR ajax changes, rest will be in another MR | Jacob Schatz | 2016-01-12 | 5 | -5/+17 |
| | | | | | | |||||
| | * | | | | reverting more MR ajax files, will appear in different commit | Jacob Schatz | 2016-01-12 | 5 | -124/+31 |
| | | | | | | |||||
| | * | | | | reverting MR ajax changes, which will be in a different MR | Jacob Schatz | 2016-01-12 | 2 | -16/+2 |
| | | | | | | |||||
| | * | | | | reverting _mr_title.html.haml | Jacob Schatz | 2016-01-12 | 1 | -16/+10 |
| | | | | | | |||||
| | * | | | | reverting merge_request_controller | Jacob Schatz | 2016-01-12 | 1 | -9/+2 |
| | | | | | | |||||
| | * | | | | restores merge request coffee file | Jacob Schatz | 2016-01-12 | 1 | -49/+0 |
| | | | | | | |||||
| | * | | | | reverting _disscusion | Jacob Schatz | 2016-01-12 | 1 | -4/+5 |
| | | | | | | |||||
| | * | | | | fixes conflicts | Jacob Schatz | 2016-01-11 | 422 | -2997/+4659 |
| | |\ \ \ \ | |||||
| | * | | | | | initial json requests instead of HTML | Jacob Schatz | 2016-01-07 | 10 | -39/+66 |
| | | | | | | | |||||
| | * | | | | | adds tests (and passes them) for ajax open and close merge requests. | Jacob Schatz | 2016-01-06 | 3 | -2/+100 |
| | | | | | | | |||||
| | * | | | | | adds ajax open and close merges, with discussion/comments working as well | Jacob Schatz | 2016-01-05 | 5 | -25/+67 |
| | | | | | | | |||||
| | * | | | | | removes commented out code. | Jacob Schatz | 2015-12-30 | 1 | -2/+0 |
| | | | | | | | |||||
| | * | | | | | adds ajax to bottom discussion buttons. Now submits issue and closes via ajax. | Jacob Schatz | 2015-12-29 | 3 | -19/+15 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'add_username_to_user_system_hooks' of ↵ | Dmitriy Zaporozhets | 2016-01-13 | 3 | -17/+26 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/tbeadle/gitlabhq Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | | | Include user_username in user_(add_to/remove_from)_(project/group) system hooks. | Tommy Beadle | 2016-01-07 | 3 | -4/+10 |
| | | | | | | | | |||||
| | * | | | | | | Include the username in user_create/destroy system hooks. | Tommy Beadle | 2016-01-07 | 3 | -3/+6 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #9952 from tbeadle/user_id_in_member_system_hook | Dmitriy Zaporozhets | 2016-01-13 | 2 | -2/+3 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Include the user_id in user_*_team system hooks. | ||||
| | * | | | | | | | Include the user_id in user_*_team system hooks. | Tommy Beadle | 2016-01-06 | 2 | -2/+3 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue where the user_id is not included in the data for user_add_to_team and user_remove_from_team system hooks. The documentation already states that the user_id should be included. | ||||
| * | | | | | | | Merge pull request #9968 from vimalloc/patch-1 | Stan Hu | 2016-01-12 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Mention channel/key bug in irkerd docs | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |