summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fixes "iid of max iid" in Issuable sidebar for merged MRfix/13928-wrong-iid-of-max-iidRémy Coutable2016-03-081-1/+5
* Merge branch 'master' into 'master' Yorick Peterse2016-03-083-0/+23
|\
| * adds test for git push service for updating the language of the projecttiagonbotelho2016-03-071-3/+5
| * moves the main_language update logic to git push servicetiagonbotelho2016-03-072-8/+12
| * removes automatic setting of main_language to project for it to set a main la...tiagonbotelho2016-03-071-10/+0
| * fixes typotiagonbotelho2016-03-071-1/+1
| * removes redundant selftiagonbotelho2016-03-071-1/+1
| * adds tests and fixes some broken code to main language mrtiagonbotelho2016-03-071-3/+3
| * adds swp and swo to gitignore and improves migration for project main_languagetiagonbotelho2016-03-073-6/+18
| * removes unused methods that I forgottiagonbotelho2016-03-072-16/+0
| * implements project languages saving them onto the databasetiagonbotelho2016-03-072-0/+12
| * moves method to repository modeltiagonbotelho2016-03-072-7/+13
| * changes if ! to unless and now asks for language instead of languagestiagonbotelho2016-03-071-3/+4
| * adds cache to languages listtiagonbotelho2016-03-071-4/+4
| * adds language names to projects list github styletiagonbotelho2016-03-072-0/+12
* | Merge branch 'cache-raw-2' into 'master' Douwe Maan2016-03-075-1/+30
|\ \ | |/ |/|
| * Use Rails etag/cache_control helperscache-raw-2Jacob Vosmaer2016-03-071-11/+4
| * Refactor caching codeJacob Vosmaer2016-03-074-11/+18
| * Revert changes in the Project modelJacob Vosmaer2016-03-071-4/+3
| * Tell clients/proxies to cache raw blob requestsJacob Vosmaer2016-03-035-4/+34
* | Merge branch 'issue_13621_2' into 'master' Douwe Maan2016-03-0741-587/+358
|\ \
| * | Updates from last code review.issue_13621_2Rubén Dávila2016-03-0630-483/+314
| * | Add link with filter by milestone for labels and avatar.Rubén Dávila2016-03-041-2/+8
| * | Add missing partials!Rubén Dávila2016-03-042-0/+31
| * | Show some stats about Milestone according to the new UI.Rubén Dávila2016-03-042-10/+26
| * | Show Project name on Labels tab for Group and Dashboard context.Rubén Dávila2016-03-041-1/+8
| * | Use the same partial when rendering Issues or Merge Requests.Rubén Dávila2016-03-047-59/+10
| * | Make Merge Requests tab have the same look as Issues.Rubén Dávila2016-03-048-50/+26
| * | Show project name for Issues tab in Group and Dashboard context.Rubén Dávila2016-03-045-10/+17
| * | Refactor Milestone view for Dashboard.Rubén Dávila2016-03-045-70/+10
| * | Refactor Merge Requests tab into a custom partialRubén Dávila2016-03-045-15/+47
| * | Refactor Merge Requests tab into a custom partialRubén Dávila2016-03-043-21/+10
| * | Eager load Issues/MRs project for Milestone.Rubén Dávila2016-03-044-4/+7
| * | Refactor Merge Requests tab into a custom partialRubén Dávila2016-03-045-29/+20
| * | Recator Issues Tab into a custom partial.Rubén Dávila2016-03-045-24/+14
| * | Refactor GlobalMilestone queries.Rubén Dávila2016-03-048-18/+19
* | | Merge branch 'feature/cross-project-labels' into 'master' Douwe Maan2016-03-073-15/+46
|\ \ \
| * | | Escape project's name in cross project labelfeature/cross-project-labelsGrzegorz Bizon2016-03-051-1/+1
| * | | Remove redundant code in cross project labels implementationGrzegorz Bizon2016-03-031-3/+4
| * | | Change content of cross project labelGrzegorz Bizon2016-03-031-2/+2
| * | | Mention cross-project labels in markdown documentationGrzegorz Bizon2016-03-031-0/+4
| * | | Improve cross project label look and feelGrzegorz Bizon2016-03-031-5/+6
| * | | Add additional text prefix in cross project labelsGrzegorz Bizon2016-03-032-4/+11
| * | | Add support for cross project references for labelsGrzegorz Bizon2016-03-031-1/+6
| * | | Add cross project references support for label modelGrzegorz Bizon2016-03-031-4/+20
| * | | Add support for keyword arguments in label reference methodGrzegorz Bizon2016-03-032-7/+4
* | | | Merge branch 'indicate-mr-diverged-from-target' into 'master' Douwe Maan2016-03-072-0/+25
|\ \ \ \
| * | | | Indicate how much an MR branch diverges from the target branchPierre de La Morinerie2016-03-032-0/+25
* | | | | Merge branch 'rs-note-delegates-mentionable'Douwe Maan2016-03-071-10/+1
|\ \ \ \ \
| * | | | | Delegate a Note's Mentionable methods to its noteable objectrs-note-delegates-mentionableRobert Speicher2016-03-051-10/+1