summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update fixtures/emojis/index.jsonRobert Speicher2016-02-151-1823/+18276
* Fix specs expecting `emoji/` in image pathRobert Speicher2016-02-132-3/+3
* Update Emoji asset pathRobert Speicher2016-02-123-4/+5
* Update gitlab_emoji to ~> 0.3.0Robert Speicher2016-02-122-5/+5
* Remove unused emoji_autocomplete_source helperRobert Speicher2016-02-121-6/+0
* Merge branch 'fix_500-commit-null' into 'master' Douwe Maan2016-02-121-1/+1
|\
| * Don't try to mark broken MR as mergableNemanja Boric2016-02-111-1/+1
* | Merge branch 'rs-issue-merge-requests' into 'master' Douwe Maan2016-02-121-3/+3
|\ \
| * | Correct indentation for `issues/merge_requests` partial renderrs-issue-merge-requestsRobert Speicher2016-02-111-3/+3
* | | Merge branch 'rs-loosen-nokogiri' into 'master' Dmitriy Zaporozhets2016-02-122-2/+2
|\ \ \
| * | | Loosen Nokogiri version requirementrs-loosen-nokogiriRobert Speicher2016-02-112-2/+2
* | | | Merge branch 'workhorse-0.6.4' into 'master' Rémy Coutable2016-02-123-3/+3
|\ \ \ \
| * | | | Use gitlab-workhorse 0.6.4workhorse-0.6.4Jacob Vosmaer2016-02-123-3/+3
* | | | | Merge branch 're-add-update-configuration-files-in-latest-upgrade-guide' into...Rémy Coutable2016-02-121-2/+12
|\ \ \ \ \
| * | | | | Re-add "Update configuration files" section in the 8.4 to 8.5 upgrade guideRémy Coutable2016-02-121-2/+12
* | | | | | Merge branch 'olirogers/gitlab-ce-project-milestone-order' into 'master' Douwe Maan2016-02-124-12/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix milestone order in project and issue edit lists to due_dateolirogers/gitlab-ce-project-milestone-orderOliver Rogers2016-02-104-12/+10
* | | | | | Merge branch 'typo_api_builds_doc' into 'master' Achilleas Pipinellis2016-02-121-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typo in doc/api/builds.mdAchilleas Pipinellis2016-02-121-1/+1
|/ / / / / /
* | | | | | Merge branch 'streamline-email-validation' into 'master' Douwe Maan2016-02-1211-53/+89
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Re-add EmailValidator to avoid the repetition of format: { with: Devise.email...streamline-email-validationRémy Coutable2016-02-095-6/+10
| * | | | | Validate email addresses using Devise.email_regexpRémy Coutable2016-02-0911-58/+90
* | | | | | Merge branch 'skakirill/gitlab-ce-api-merge-request-setup-milestone' into 'ma...Douwe Maan2016-02-124-5/+19
|\ \ \ \ \ \
| * | | | | | Add a spec for setting/updating a MR's milestone via the APIskakirill/gitlab-ce-api-merge-request-setup-milestoneRémy Coutable2016-02-091-3/+12
| * | | | | | API: Allow to set or update a merge-request's milestoneKirill Skachkov2016-02-083-2/+7
* | | | | | | Merge branch 'issue_13369' into 'master' Robert Speicher2016-02-121-8/+9
|\ \ \ \ \ \ \
| * | | | | | | Don't show fork button if user can't fork the project.issue_13369Rubén Dávila2016-02-111-8/+9
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'issue_13365' into 'master' Robert Speicher2016-02-121-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Load all blob data when highlighting content for git-blame.Rubén Dávila2016-02-111-0/+1
|/ / / / / /
* | | | | | Merge branch 'fix_markdown_image_link' into 'master' Achilleas Pipinellis2016-02-112-4/+4
|\ \ \ \ \ \
| * | | | | | Add a new image in the markdown help pageAchilleas Pipinellis2016-02-112-4/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'remove_sqlite_check' into 'master' Jeroen van Baarsen2016-02-111-18/+0
|\ \ \ \ \ \
| * | | | | | Remove sqlite check in raketaskremove_sqlite_checkAchilleas Pipinellis2016-02-101-18/+0
* | | | | | | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-02-111-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Updated Docker Fundamentals link as suggested by @axilDenis Meiswinkel2016-02-111-1/+1
| * | | | | | | Fixed "Docker Fundamentals" link.Denis Meiswinkel2016-02-111-1/+1
* | | | | | | | Merge branch 'Schniz/gitlab-ce-feature/merge-request-closes-issues-in-api' in...Rémy Coutable2016-02-114-0/+98
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Pass current_user to merge_request.closes_issues in API ans streamline MR API...Schniz/gitlab-ce-feature/merge-request-closes-issues-in-apiRémy Coutable2016-02-113-19/+9
| * | | | | | | Added '/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues' r...Gal Schlezinger2016-02-115-0/+108
* | | | | | | | Merge branch 'use-caching' into 'master' Kamil Trzciński2016-02-112-6/+52
|\ \ \ \ \ \ \ \
| * | | | | | | | Use caching, instead of haxxy /cacheuse-cachingKamil Trzcinski2016-02-102-6/+52
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'fix/ci-build-status-badge' into 'master' Kamil Trzciński2016-02-1111-40/+133
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Parse XML instead of HTML in tests for a SVG build badgefix/ci-build-status-badgeGrzegorz Bizon2016-02-113-7/+7
| * | | | | | | Move build badge specs to badges directoryGrzegorz Bizon2016-02-112-6/+3
| * | | | | | | Move builds badge implementation to new badges controllerGrzegorz Bizon2016-02-115-14/+19
| * | | | | | | Add Changelog entry for changes in builds badgeGrzegorz Bizon2016-02-111-0/+1
| * | | | | | | Inherit build badge access permissions from projectGrzegorz Bizon2016-02-114-13/+7
| * | | | | | | Fix rubocop offence in routes for build badgeGrzegorz Bizon2016-02-111-1/+1
| * | | | | | | Add short builds badge documentationGrzegorz Bizon2016-02-111-0/+10
| * | | | | | | Improve build badge tests, add another test caseGrzegorz Bizon2016-02-113-6/+19
View Lorry Controller Status