summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed issue with dashboard/issues not filtering by milestonedashboard-filter-milestonePhil Hughes2016-04-112-1/+61
* Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-04-111-7/+6
|\
| * fix typoBenjamin Montgomery2016-04-101-1/+3
| * Make the purpose of artifact config options clearerBenjamin Montgomery2016-04-101-9/+6
| * actually enable artifactsBenjamin Montgomery2016-04-091-2/+2
* | Merge branch 'add-missing-mixin' into 'master' Stan Hu2016-04-111-4/+6
|\ \
| * | Use false/true mixin in migration from !3640Stan Hu2016-04-101-4/+6
|/ /
* | Merge branch 'fix-raw-sql-migrations' into 'master' Stan Hu2016-04-114-12/+18
|\ \
| * | Fix more SQL migrations to use raw commandsStan Hu2016-04-104-12/+18
* | | Merge branch 'upgrade-annotate' into 'master' Robert Speicher2016-04-112-4/+4
|\ \ \
| * | | Upgrade annotate from 2.6.10 to 2.7.0connorshea2016-04-102-4/+4
| |/ /
* | | Merge branch 'upgrade-premailer-rails' into 'master' Robert Speicher2016-04-111-3/+3
|\ \ \
| * | | Upgrade premailer-rails from 1.9.0 to 1.9.2connorshea2016-04-101-3/+3
| |/ /
* | | Merge branch 'fix-milestone-seedfu' into 'master' Robert Speicher2016-04-111-1/+1
|\ \ \
| * | | Fix seed_fu failure with inserting milestones into test DBStan Hu2016-04-101-1/+1
* | | | Merge branch 'issue_14353' into 'master' Jacob Schatz2016-04-111-1/+2
|\ \ \ \
| * | | | Use existence operator insteadissue_14353Alfredo Sumaran2016-04-101-1/+1
| * | | | Check existence of variable methodAlfredo Sumaran2016-04-101-1/+1
| * | | | Ignore toggling sidebar for above 1200px resolutionAlfredo Sumaran2016-04-101-1/+2
| | |/ / | |/| |
* | | | Merge branch 'prevent_users_from_upvoting_downvoting_emoji' into 'master' Jacob Schatz2016-04-113-3/+78
|\ \ \ \ | |/ / / |/| | |
| * | | write test to prevent reoccurence of issueprevent_users_from_upvoting_downvoting_emojiArinde Eniola2016-04-091-0/+64
| * | | prevent users from being able to both upvote and downvoteArinde Eniola2016-04-092-3/+14
* | | | Merge branch 'rs-markdown-preview-tabindex' into 'master' Jacob Schatz2016-04-101-3/+3
|\ \ \ \
| * | | | Remove tab stop from "Write", "Preview", "Go full screen" linksrs-markdown-preview-tabindexRobert Speicher2016-04-091-3/+3
| |/ / /
* | | | Merge branch 'redesign_labels_page' into 'master' Jacob Schatz2016-04-106-11/+74
|\ \ \ \ | |_|/ / |/| | |
| * | | apply some css changesredesign_labels_pageArinde Eniola2016-04-061-4/+1
| * | | fix the failing tests and some changesArinde Eniola2016-04-064-14/+18
| * | | finish up the design and add info to the changelogArinde Eniola2016-04-064-8/+15
| * | | make the view responsive for extra small deviceArinde Eniola2016-04-061-0/+20
| * | | set the width to the elementsArinde Eniola2016-04-061-2/+3
| * | | change the subscribe, delete and edit buttons to iconsArinde Eniola2016-04-063-8/+42
* | | | Merge branch 'project-services-page-should-contain-full-info' into 'master' Achilleas Pipinellis2016-04-102-15/+21
|\ \ \ \
| * | | | Everything on one page.project-services-page-should-contain-full-infoSytse Sijbrandij2016-04-092-15/+21
* | | | | Merge branch 'fix-project-last-activity-at-migration' into 'master' Robert Speicher2016-04-101-7/+9
|\ \ \ \ \
| * | | | | Use raw SQL instead of Rails models in 20130403003950 migrationStan Hu2016-04-091-7/+9
|/ / / / /
* | | | | Merge branch 'rs-sidekiq-sentry-context' into 'master' Stan Hu2016-04-101-0/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add a `program` tag to Sentry Raven contextrs-sidekiq-sentry-contextRobert Speicher2016-04-091-0/+10
| | |/ / | |/| |
* | | | Merge branch 'enable-compress-in-production' into 'master' Robert Speicher2016-04-092-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Enable asset compression in production.connorshea2016-04-092-0/+4
| | |/ | |/|
* | | Merge branch '14400-diff-redesign' into 'master' Jacob Schatz2016-04-0919-74/+119
|\ \ \ | |/ / |/| |
| * | Remove comment count & icon from side by side view14400-diff-redesignAnnabel Dunstone2016-04-071-6/+0
| * | Diff touch upsAnnabel Dunstone2016-04-075-11/+8
| * | Fix lint errorsAnnabel Dunstone2016-04-073-8/+6
| * | Remove comment count & iconAnnabel Dunstone2016-04-071-3/+0
| * | Diff design updatesAnnabel Dunstone2016-04-0715-67/+90
| * | Merge conflict fixesAnnabel Dunstone2016-04-071-15/+15
| * | Update diff_comments testsAnnabel Dunstone2016-04-072-5/+5
| * | Update diff colors and iconsAnnabel Dunstone2016-04-077-15/+29
| * | Move diff colors to variablesAnnabel Dunstone2016-04-073-14/+24
| * | Change reply button to text fieldAnnabel Dunstone2016-04-072-7/+19