summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '24949-view-2-up-swipe-onion-skin-controls-for-merge-request-dif...Fatih Acet2016-12-134-4/+11
|\
| * Instantiate ImageFile for diff-files in Diff24949-view-2-up-swipe-onion-skin-controls-for-merge-request-diff-containing-an-imageLuke "Jared" Bennett2016-12-044-4/+11
* | Merge branch 'issue_13270' into 'master' Sean McGivern2016-12-133-1/+67
|\ \
| * | Allow to delete tag release noteissue_13270Felipe Artur2016-12-123-1/+67
* | | Merge branch 'api-dont-allow-blank-mr-titles' into 'master' Sean McGivern2016-12-132-2/+18
|\ \ \
| * | | Don't allow blank MR titles in APIapi-dont-allow-blank-mr-titlesRobert Schilling2016-12-132-2/+18
* | | | Merge branch 'fix-autoloading-issue' into 'master' Sean McGivern2016-12-131-1/+0
|\ \ \ \
| * | | | Don't require `API::API` in routesfix-autoloading-issueRémy Coutable2016-12-121-1/+0
* | | | | Merge branch 'awards_handler-fixture' into 'master' Alfredo Sumaran2016-12-133-57/+9
|\ \ \ \ \
| * | | | | Replace static fixture for awards_handler_spec (!7661)winniehell2016-12-123-57/+9
* | | | | | Merge branch 'patch-8' into 'master' Stan Hu2016-12-131-1/+1
|\ \ \ \ \ \
| * | | | | | Crontab typo '* */6' -> '0 */6' (4x/day not 1x-per-min-for-1h 4x/day)Jon Bailey2016-12-121-1/+1
| |/ / / / /
* | | | | | Merge branch 'fix-eslint-warnings' into 'master' Alfredo Sumaran2016-12-132-8/+10
|\ \ \ \ \ \
| * | | | | | Fixed lint warning and propose fail or warningfix-eslint-warningsLuke "Jared" Bennett2016-12-102-8/+10
* | | | | | | Merge branch '25155-fix-edited-text-in-comments' into 'master' Fatih Acet2016-12-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | break comment "edited at" block out of the note-text element to prevent issue...25155-fix-edited-text-in-commentsMike Greiling2016-12-121-1/+1
* | | | | | | | Merge branch '25286-customer-label-doesn-t-autocomplete-correctly' into 'mast...Alfredo Sumaran2016-12-122-19/+69
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Added special char test to the default beforeInsert callback. I removed the q...25286-customer-label-doesn-t-autocomplete-correctlyLuke "Jared" Bennett2016-12-082-19/+69
* | | | | | | | Merge branch '19550-fix-contributer-graph-duplicates' into 'master' Alfredo Sumaran2016-12-122-4/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | add CHANGELOG entry for !802119550-fix-contributer-graph-duplicatesMike Greiling2016-12-101-0/+4
| * | | | | | | | normalize author email so we can treat it as case insensitiveMike Greiling2016-12-101-4/+7
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '25106-hide-issue-mr-button-for-not-loggedin' into 'master' Fatih Acet2016-12-123-5/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | removes extra if check25106-hide-issue-mr-button-for-not-loggedinNur Rony2016-12-121-5/+4
| * | | | | | | | hides new MR button from not loggedin userNur Rony2016-12-121-2/+3
| * | | | | | | | adds changelogNur Rony2016-12-121-0/+4
| * | | | | | | | adds check for logged in user in group issuesNur Rony2016-12-121-7/+8
* | | | | | | | | Merge branch '19990-update-snippets-page-design' into 'master' Fatih Acet2016-12-1218-122/+187
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rename snippets_path helper due to conflict19990-update-snippets-page-designMike Greiling2016-12-102-5/+5
| * | | | | | | | | add new tests for snippets_finder.rbMike Greiling2016-12-101-1/+24
| * | | | | | | | | use Snippet.none in favor of nil to allow chainingMike Greiling2016-12-101-1/+1
| * | | | | | | | | implement snippets_scope_menu partial to reduce code duplicationMike Greiling2016-12-104-53/+45
| * | | | | | | | | refactor duplicate code into a by_scope methodMike Greiling2016-12-101-35/+19
| * | | | | | | | | move snippet edited timeago under the snippet titleMike Greiling2016-12-102-8/+14
| * | | | | | | | | fix snippets reference id in search results (should be $ not #)Mike Greiling2016-12-101-1/+1
| * | | | | | | | | conditionally display assoc project info in snippets indexMike Greiling2016-12-104-4/+13
| * | | | | | | | | fix failing testsMike Greiling2016-12-103-4/+4
| * | | | | | | | | update snippets list designMike Greiling2016-12-102-13/+20
| * | | | | | | | | ensure all snippets count badge is accurate for non team membersMike Greiling2016-12-101-1/+4
| * | | | | | | | | move project new snippet button into snippet scope navigation headerMike Greiling2016-12-101-27/+31
| * | | | | | | | | add scope filters to project snippets pageMike Greiling2016-12-103-7/+52
| * | | | | | | | | move new snippet button to main snippet navigation blockMike Greiling2016-12-103-48/+42
| * | | | | | | | | remove plus icon in "new snippet" buttonMike Greiling2016-12-101-2/+0
| * | | | | | | | | invert snippet action buttonsMike Greiling2016-12-102-4/+4
| * | | | | | | | | remove unused class nameMike Greiling2016-12-102-4/+4
| * | | | | | | | | update action button order for snippets pageMike Greiling2016-12-102-12/+12
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'grapify-service-api' into 'master' Rémy Coutable2016-12-1210-84/+709
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Grapify the service APIgrapify-service-apiRobert Schilling2016-12-122-7/+17
| * | | | | | | | | Grapify the service APIRobert Schilling2016-12-0911-85/+700
* | | | | | | | | | Merge branch '25429-fix-awkward-wording-in-cherry-pick-and-revert-errors' int...Alfredo Sumaran2016-12-122-6/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | prevent create_merge_request form field helpers from generating an id value25429-fix-awkward-wording-in-cherry-pick-and-revert-errorsMike Greiling2016-12-101-2/+2