summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | Merge branch 'rs-remove-diffline' into 'master' Douwe Maan2016-03-071-3/+0
|\ \ \ \ \ \
| * | | | | | Remove unused DiffLine modelrs-remove-difflineRobert Speicher2016-03-051-3/+0
| |/ / / / /
* | | | | | Merge branch 'rs-note-reuse-for-methods' into 'master' Douwe Maan2016-03-071-2/+2
|\ \ \ \ \ \
| * | | | | | Make better use of the `Note#for_*?` methodsrs-note-reuse-for-methodsRobert Speicher2016-03-051-2/+2
| |/ / / / /
* | | | | | Remove `Note#system?` "override"rs-note-model-cleanupRobert Speicher2016-03-051-4/+0
* | | | | | Remove `Note#noteable_type_name`Robert Speicher2016-03-051-4/+0
|/ / / / /
* | | | | Merge branch 'issue-sidebar-mobile' into 'master' Dmitriy Zaporozhets2016-03-0511-49/+142
|\ \ \ \ \
| * | | | | Uses the correct variable names for this situation.issue-sidebar-mobileJacob Schatz2016-03-041-2/+2
| * | | | | Only save right sidebar position cookie if user did the collapsing.Jacob Schatz2016-03-042-6/+7
| * | | | | Fixes style consistencies.Jacob Schatz2016-03-043-10/+9
| * | | | | Fix remaining media queries using correct bs paradigms.Jacob Schatz2016-03-042-14/+13
| * | | | | Correct media queries for small devices and tablets.Jacob Schatz2016-03-043-9/+13
| * | | | | Sidebar overflow on xs side.Jacob Schatz2016-03-042-7/+7
| * | | | | Combining recent change to have username in header with my MR.Jacob Schatz2016-03-042-6/+13
| * | | | | Fix bugs with open and close buttonsJacob Schatz2016-03-044-22/+27
View Lorry Controller Status