summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rename @ci_commit to @pipeline in MergeRequestControllerrename-ci-commit-phase-3Kamil Trzcinski2016-06-071-4/+4
* Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-072-8/+8
|\
| * Fix remaining test offensesrename-ci-commit-phase-2Kamil Trzcinski2016-06-072-8/+8
* | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-0736-146/+460
|\ \ | |/
| * Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-0729-102/+416
| |\
| | * Merge branch 'license-finder-gem' into 'master' Rémy Coutable2016-06-077-0/+289
| | |\
| | | * Resolve feedback.Connor Shea2016-06-062-2/+2
| | | * Add relevant commands to the licensing document, resolve some feedback.Connor Shea2016-06-062-3/+34
| | | * Make sure to mention the GNU Project and OSI-provided information regarding t...Connor Shea2016-06-061-2/+6
| | | * Add Licensing information and guidelines to the Documentation.Connor Shea2016-06-063-1/+60
| | | * Fix up all the decisions in the YML file.Connor Shea2016-06-061-115/+96
| | | * Add gems and licenses that were previously missing. Approve a number of licen...Connor Shea2016-06-062-8/+116
| | | * Add some gems' licenses not caught by License Finder.Connor Shea2016-06-063-0/+96
| | | * Add License Finder gem.Connor Shea2016-06-062-0/+10
| | * | Merge branch 'colorize-db-seed' into 'master' Rémy Coutable2016-06-072-7/+7
| | |\ \
| | | * | Fix missed colorize methods.Connor Shea2016-06-062-7/+7
| | * | | Merge branch 'bump-rouge' into 'master' Stan Hu2016-06-073-3/+4
| | |\ \ \
| | | * | | Bump rouge to 1.11.0Stan Hu2016-06-063-3/+4
| | |/ / /
| | * | | Merge branch '18254-use-better_errors-editor-links-in-sherlock' into 'master' Robert Speicher2016-06-072-3/+11
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Use better_errors editor links in sherlock18254-use-better_errors-editor-links-in-sherlockAlejandro Rodríguez2016-06-062-3/+11
| | |/ /
| | * | Merge branch 'wiki-bottom-padding' into 'master' Jacob Schatz2016-06-061-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Add padding to bottom of wiki page, fix #12921.Connor Shea2016-06-061-1/+1
| | * | Merge branch 'issue_3359' into 'master' Yorick Peterse2016-06-065-6/+30
| | |\ \
| | | * | change add_concurrent_index function argumentsissue_3359Felipe Artur2016-06-062-10/+13
| | | * | Add index to notification settingsFelipe Artur2016-06-034-1/+22
| | * | | Merge branch 'activity-links' into 'master' Jacob Schatz2016-06-061-3/+7
| | |\ \ \
| | | * | | Fixed issue with activity links not being consistentactivity-linksPhil Hughes2016-06-021-3/+7
| | * | | | Merge branch 'edit-mobile' into 'master' Jacob Schatz2016-06-063-9/+26
| | |\ \ \ \
| | | * | | | Shows the edit comment button on mobileedit-mobilePhil Hughes2016-06-023-9/+26
| | | |/ / /
| | * | | | Merge branch '18026-consider-removing-issue-merge-request-previous-next-butto...Jacob Schatz2016-06-067-70/+1
| | |\ \ \ \
| | | * | | | Remove prev/next buttons on issues and merge requests18026-consider-removing-issue-merge-request-previous-next-buttonsAlejandro Rodríguez2016-06-067-70/+1
| | * | | | | Merge branch 'confidential-issue-notice' into 'master' Jacob Schatz2016-06-063-0/+40
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Fix error on non-issue pages with comment areas.Connor Shea2016-06-051-1/+1
| | | * | | | Add Changelog entry.Connor Shea2016-06-031-0/+1
| | | * | | | Add confidential issue notice in comment box.Connor Shea2016-06-032-0/+39
| * | | | | | Fix tests failuresKamil Trzcinski2016-06-077-44/+44
* | | | | | | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-0631-156/+1798
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-0622-136/+1501
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 'notes-are-awardables' into 'master' Douwe Maan2016-06-0622-136/+1501
| | |\ \ \ \ \
| | | * | | | | Updated MR notes.notes-are-awardablesFatih Acet2016-06-066-22/+21
| | | * | | | | Update tests on wordingZ.J. van de Weg2016-06-061-2/+2
| | | * | | | | Fix scss-lint.Fatih Acet2016-06-061-1/+1
| | | * | | | | Added tests for award emoji feature.Fatih Acet2016-06-068-24/+1235
| | | * | | | | Create and show emoji loader on the fly.Fatih Acet2016-06-062-6/+21
| | | * | | | | Some design related tweaks.Fatih Acet2016-06-066-7/+24
| | | * | | | | Be consistent on naming.Fatih Acet2016-06-061-22/+22
| | | * | | | | Animate emoji when rendered.Fatih Acet2016-06-061-1/+12
| | | * | | | | Fix mutual exclusivity for emoji only comments.Fatih Acet2016-06-061-1/+4
| | | * | | | | Refactor awardsHandler methods to work with votesBlock.Fatih Acet2016-06-062-35/+36
| | | * | | | | Award emoji implementation for notes.Fatih Acet2016-06-063-65/+92