summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maintain-milestone-filter' into 'master' Douwe Maan2016-01-131-1/+1
|\
| * enable milestone filter to stickGreg Smethells2016-01-121-1/+1
* | Merge branch 'referenced-merge-requests' into 'master' Dmitriy Zaporozhets2016-01-136-8/+19
|\ \
| * | changes `$quote-gray` to `$secondary-text`referenced-merge-requestsJacob Schatz2016-01-122-2/+2
| * | makes message plural for multiple MRs and removes from loop. Duh.Jacob Schatz2016-01-123-5/+11
| * | merge request close message moved and merge request now refered by `!`.Jacob Schatz2016-01-125-6/+11
* | | Merge branch 'rs-block-user-before-removal' into 'master' Dmitriy Zaporozhets2016-01-132-4/+7
|\ \ \
| * | | Block the reported user before destroying the recordrs-block-user-before-removalRobert Speicher2016-01-122-4/+7
| | |/ | |/|
* | | Merge branch 'rs-time_ago_with_tooltip-conversion' into 'master' Dmitriy Zaporozhets2016-01-131-1/+1
|\ \ \
| * | | Make sure time_ago_with_tooltip is using a Time objectrs-time_ago_with_tooltip-conversionRobert Speicher2016-01-121-1/+1
| | |/ | |/|
* | | Merge branch 'comment-and-close-button-does-not-submit-comment' into 'master' Dmitriy Zaporozhets2016-01-135-21/+37
|\ \ \
| * | | gets merge request discussion working againcomment-and-close-button-does-not-submit-commentJacob Schatz2016-01-123-4/+24
| * | | adds back in discussion.haml.html for issues commenting and closing/reopening...Jacob Schatz2016-01-122-4/+4
| * | | removing last chunk of MR ajax changes, rest will be in another MRJacob Schatz2016-01-125-5/+17
| * | | reverting more MR ajax files, will appear in different commitJacob Schatz2016-01-123-25/+30
| * | | reverting MR ajax changes, which will be in a different MRJacob Schatz2016-01-122-16/+2
| * | | reverting _mr_title.html.hamlJacob Schatz2016-01-121-16/+10
| * | | reverting merge_request_controllerJacob Schatz2016-01-121-9/+2
| * | | restores merge request coffee fileJacob Schatz2016-01-121-49/+0
| * | | reverting _disscusionJacob Schatz2016-01-121-4/+5
| * | | fixes conflictsJacob Schatz2016-01-11217-907/+1391
| |\ \ \
| * | | | initial json requests instead of HTMLJacob Schatz2016-01-0710-39/+66
| * | | | adds ajax open and close merges, with discussion/comments working as wellJacob Schatz2016-01-055-25/+67
| * | | | removes commented out code.Jacob Schatz2015-12-301-2/+0
| * | | | adds ajax to bottom discussion buttons. Now submits issue and closes via ajax.Jacob Schatz2015-12-293-19/+15
* | | | | Merge branch 'add_username_to_user_system_hooks' of https://github.com/tbeadl...Dmitriy Zaporozhets2016-01-131-1/+4
|\ \ \ \ \
| * | | | | Include user_username in user_(add_to/remove_from)_(project/group) system hooks.Tommy Beadle2016-01-071-0/+2
| * | | | | Include the username in user_create/destroy system hooks.Tommy Beadle2016-01-071-1/+2
* | | | | | Merge pull request #9952 from tbeadle/user_id_in_member_system_hookDmitriy Zaporozhets2016-01-131-0/+1
|\ \ \ \ \ \
| * | | | | | Include the user_id in user_*_team system hooks.Tommy Beadle2016-01-061-0/+1
| |/ / / / /
* | | | | | Mention channel/key bug in irkerd docsLandon2016-01-121-3/+4
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'change_milestone_close_copy' into 'master' Dmitriy Zaporozhets2016-01-121-1/+1
|\ \ \ \ \
| * | | | | Revert group milestone copychange_milestone_close_copyJosh Frye2016-01-121-1/+1
| * | | | | Change milestone close notice copy. Closes #6051Josh Frye2016-01-112-2/+2
* | | | | | Merge branch 'improve_more_buttons' into 'master' Jacob Schatz2016-01-123-4/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Improve admin area button styleDrew Blessing2016-01-113-4/+4
* | | | | | Merge branch 'show-ip-addresses' into 'master' Dmitriy Zaporozhets2016-01-121-0/+16
|\ \ \ \ \ \
| * | | | | | Add user's last used IP addresses to admin pageStan Hu2016-01-121-0/+16
* | | | | | | Merge branch 'improve_button_styles' into 'master' Dmitriy Zaporozhets2016-01-123-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Improve button stylesDrew Blessing2016-01-083-4/+4
* | | | | | | Merge branch 'hover-descriptions' into 'master' Dmitriy Zaporozhets2016-01-121-5/+9
|\ \ \ \ \ \ \
| * | | | | | | adds hover titles to merge request and issue pageshover-descriptionsJacob Schatz2016-01-111-5/+9
* | | | | | | | Merge branch 'active-state-on-button-makes-it-uppercase' into 'master' Dmitriy Zaporozhets2016-01-121-3/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | changes bolded on active for dropdowns, sitewide.active-state-on-button-makes-it-uppercaseJacob Schatz2016-01-111-3/+2
* | | | | | | | | Merge branch 'rs-add-title-to-emoji' into 'master' Dmitriy Zaporozhets2016-01-121-3/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add title attribute to Emojis in award pickerrs-add-title-to-emojiRobert Speicher2016-01-111-3/+6
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Call clearInterval for the currentTimer if one existsRobert Speicher2016-01-111-0/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'fix/ci-linter-sequence-validations' into 'master' Robert Speicher2016-01-112-5/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Allow subsequent validations in CI Linterfix/ci-linter-sequence-validationsGrzegorz Bizon2016-01-112-5/+7
* | | | | | | | Merge branch 'fix-ci-builds-for-tags' into 'master' Robert Speicher2016-01-111-0/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
View Lorry Controller Status