| Commit message (Expand) | Author | Age | Files | Lines |
* | Improve the consistency of commit titles, branch names, tag names, issue/MR t...fix/titles-weight | Rémy Coutable | 2016-01-14 | 12 | -9/+24 |
* | Add Changelog entry for build traces data integrity fix | Grzegorz Bizon | 2016-01-13 | 1 | -0/+1 |
* | Merge branch 'doc_styleguide' into 'master'
| Achilleas Pipinellis | 2016-01-13 | 4 | -26/+236 |
|\ |
|
| * | Update doc_styleguide.md [ci skip] | Achilleas Pipinellis | 2016-01-13 | 1 | -24/+28 |
| * | Clarify the naming guidelinedoc_styleguide | Achilleas Pipinellis | 2016-01-12 | 1 | -1/+4 |
| * | Add new location of doc_styleguide in CONTRIBUTING.md | Achilleas Pipinellis | 2016-01-12 | 1 | -2/+2 |
| * | Move doc_styleguide in the development directory | Achilleas Pipinellis | 2016-01-12 | 3 | -24/+227 |
* | | Merge branch 'user-search-hint' into 'master'
| Drew Blessing | 2016-01-13 | 2 | -2/+2 |
|\ \ |
|
| * | | Added hint that you can search users by name, username, or email. | Patricio Cano | 2016-01-13 | 2 | -2/+2 |
|/ / |
|
* | | Merge branch 'configure-randomize-metrics-sample-interval' into 'master'
| Yorick Peterse | 2016-01-13 | 7 | -259/+318 |
|\ \ |
|
| * | | Randomize metrics sample intervalsconfigure-randomize-metrics-sample-interval | Yorick Peterse | 2016-01-13 | 2 | -4/+46 |
| * | | Make the metrics sampler interval configurable | Yorick Peterse | 2016-01-13 | 6 | -255/+272 |
* | | | Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master'
| Douwe Maan | 2016-01-13 | 6 | -10/+11 |
|\ \ \ |
|
| * | | | Add changelog | Jason Lee | 2016-01-13 | 1 | -0/+1 |
| * | | | Use CGI.escape instead of URI.escape, because URI is obsoleted. | Jason Lee | 2016-01-12 | 4 | -8/+8 |
| * | | | Fix #9963 reference_filter "Encoding::CompatibilityError" bug with some compl... | Jason Lee | 2016-01-12 | 1 | -2/+2 |
* | | | | Merge branch 'ci/api-projects' into 'master'
| Douwe Maan | 2016-01-13 | 3 | -9/+26 |
|\ \ \ \ |
|
| * | | | | Modify CI features in projects APIci/api-projects | Tomasz Maczukin | 2016-01-11 | 4 | -51/+17 |
| * | | | | Update ./doc/api | Tomasz Maczukin | 2016-01-07 | 2 | -3/+42 |
| * | | | | Add ci fields in project create/update feature API | Tomasz Maczukin | 2016-01-05 | 2 | -4/+13 |
| * | | | | Add CI data to projcet entity | Tomasz Maczukin | 2016-01-05 | 1 | -0/+3 |
* | | | | | Merge branch 'maintain-milestone-filter' into 'master'
| Douwe Maan | 2016-01-13 | 2 | -1/+2 |
|\ \ \ \ \ |
|
| * | | | | | enable milestone filter to stick | Greg Smethells | 2016-01-12 | 2 | -1/+2 |
* | | | | | | Merge branch 'referenced-merge-requests' into 'master'
| Dmitriy Zaporozhets | 2016-01-13 | 6 | -8/+19 |
|\ \ \ \ \ \ |
|
| * | | | | | | 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 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Don't automatically require awesome_printrs-disable-colorization | Robert Speicher | 2016-01-12 | 1 | -1/+1 |
| * | | | | | | | 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 recordrs-block-user-before-removal | Robert Speicher | 2016-01-12 | 3 | -4/+23 |
| |/ / / / / / / |
|
* | | | | | | | | 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 objectrs-time_ago_with_tooltip-conversion | Robert Speicher | 2016-01-12 | 2 | -1/+5 |
* | | | | | | | | | Merge branch 'comment-and-close-button-does-not-submit-comment' into 'master'
| Dmitriy Zaporozhets | 2016-01-13 | 6 | -22/+38 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | 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 closing/reopening... | Jacob Schatz | 2016-01-12 | 2 | -4/+4 |
| * | | | | | | | | | 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 |