summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove (invalid) timestamp formattingrs-broadcastsRobert Speicher2016-01-131-2/+2
* Move `BroadcastMessage#status` to a helper since it's presentationalRobert Speicher2016-01-135-31/+31
* Update CHANGELOGRobert Speicher2016-01-131-0/+1
* Broadcast Messages can now be editedRobert Speicher2016-01-135-28/+49
* Update Broadcast Message featuresRobert Speicher2016-01-132-14/+34
* Update BroadcastMessage modelRobert Speicher2016-01-133-6/+117
* Update broadcast_message helperRobert Speicher2016-01-134-26/+45
* Simplify BroadcastMessage factoryRobert Speicher2016-01-133-11/+11
* Simplify broadcast message JSRobert Speicher2016-01-131-3/+4
* Remove alert_type attribute from BroadcastMessageRobert Speicher2016-01-135-7/+12
* Move broadcast message form to a partialRobert Speicher2016-01-133-34/+39
* Style the broadcast message formRobert Speicher2016-01-133-6/+13
* Add js-requires-input to formRobert Speicher2016-01-131-3/+2
* Merge branch 'configure-randomize-metrics-sample-interval' into 'master' Yorick Peterse2016-01-137-259/+318
|\
| * Randomize metrics sample intervalsconfigure-randomize-metrics-sample-intervalYorick Peterse2016-01-132-4/+46
| * Make the metrics sampler interval configurableYorick Peterse2016-01-136-255/+272
* | Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master' Douwe Maan2016-01-136-10/+11
|\ \
| * | Add changelogJason Lee2016-01-131-0/+1
| * | Use CGI.escape instead of URI.escape, because URI is obsoleted.Jason Lee2016-01-124-8/+8
| * | Fix #9963 reference_filter "Encoding::CompatibilityError" bug with some compl...Jason Lee2016-01-121-2/+2
* | | Merge branch 'ci/api-projects' into 'master' Douwe Maan2016-01-133-9/+26
|\ \ \
| * | | Modify CI features in projects APIci/api-projectsTomasz Maczukin2016-01-114-51/+17
| * | | Update ./doc/apiTomasz Maczukin2016-01-072-3/+42
| * | | Add ci fields in project create/update feature APITomasz Maczukin2016-01-052-4/+13
| * | | Add CI data to projcet entityTomasz Maczukin2016-01-051-0/+3
* | | | Merge branch 'maintain-milestone-filter' into 'master' Douwe Maan2016-01-132-1/+2
|\ \ \ \
| * | | | enable milestone filter to stickGreg Smethells2016-01-122-1/+2
* | | | | 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-disable-colorization' into 'master' Dmitriy Zaporozhets2016-01-132-1/+3
|\ \ \ \ \ \
| * | | | | | Don't automatically require awesome_printrs-disable-colorizationRobert Speicher2016-01-121-1/+1
| * | | | | | Disable colorization if STDOUT is not a ttyRobert Speicher2016-01-121-0/+2
* | | | | | | Merge branch 'rs-block-user-before-removal' into 'master' Dmitriy Zaporozhets2016-01-133-4/+23
|\ \ \ \ \ \ \
| * | | | | | | Block the reported user before destroying the recordrs-block-user-before-removalRobert Speicher2016-01-123-4/+23
| |/ / / / / /
* | | | | | | Merge branch 'rs-time_ago_with_tooltip-conversion' into 'master' Dmitriy Zaporozhets2016-01-132-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Make sure time_ago_with_tooltip is using a Time objectrs-time_ago_with_tooltip-conversionRobert Speicher2016-01-122-1/+5
* | | | | | | | Merge branch 'comment-and-close-button-does-not-submit-comment' into 'master' Dmitriy Zaporozhets2016-01-136-22/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | 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-125-124/+31
| * | | | | | | | 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-11422-2997/+4659
| |\ \ \ \ \ \ \ \
| * | | | | | | | | initial json requests instead of HTMLJacob Schatz2016-01-0710-39/+66
View Lorry Controller Status