summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/cross-project-labels' into 'master' Douwe Maan2016-03-0710-75/+128
|\
| * 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-032-7/+4
| * Change content of cross project labelGrzegorz Bizon2016-03-032-5/+5
| * Mention cross-project labels in markdown documentationGrzegorz Bizon2016-03-032-0/+5
| * Add Changelog entry for cross-project label referencesGrzegorz Bizon2016-03-031-0/+1
| * Improve cross project label look and feelGrzegorz Bizon2016-03-032-7/+14
| * Add additional text prefix in cross project labelsGrzegorz Bizon2016-03-033-6/+17
| * Add support for cross project references for labelsGrzegorz Bizon2016-03-033-55/+48
| * Fix bug with return value in abstract reference filterGrzegorz Bizon2016-03-031-0/+2
| * Add cross project references support for label modelGrzegorz Bizon2016-03-032-5/+45
| * Add support for keyword arguments in label reference methodGrzegorz Bizon2016-03-035-11/+8
* | Merge branch 'rs-factory-nitpicks' into 'master' Douwe Maan2016-03-0717-41/+51
|\ \
| * | Remove unnecessary attribute definitions from Service factoryrs-factory-nitpicksRobert Speicher2016-03-061-2/+0
| * | Add traits for each access_level to ProjectMember factoryRobert Speicher2016-03-0615-30/+50
| * | Remove unused `another_email` factoryRobert Speicher2016-03-061-9/+1
* | | Merge branch 'indicate-mr-diverged-from-target' into 'master' Douwe Maan2016-03-078-5/+153
|\ \ \
| * | | Indicate how much an MR branch diverges from the target branchPierre de La Morinerie2016-03-038-1/+146
| * | | Tests: extract a merge_request_path helperPierre de La Morinerie2016-03-031-4/+7
* | | | 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
| |/ / / /
* | | | | Merge branch 'rs-note-model-cleanup' into 'master' Douwe Maan2016-03-071-8/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | 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 'ci_quickstart' into 'master' Achilleas Pipinellis2016-03-061-11/+38
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add a TL;DR version in quick start guideci_quickstartAchilleas Pipinellis2016-03-011-11/+38
* | | | | Merge branch 'master' into 'master' Robert Speicher2016-03-051-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Reduce progress bar noise during brakeman runPeter Suschlik2016-03-041-1/+1
* | | | | Merge branch 'issue_2805' into 'master' Douwe Maan2016-03-052-3/+4
|\ \ \ \ \
| * | | | | Upgrade carrierwave to 0.10.0.issue_2805Rubén Dávila2016-03-032-3/+4
* | | | | | Merge branch 'issue-sidebar-mobile' into 'master' Dmitriy Zaporozhets2016-03-0512-49/+143
|\ \ \ \ \ \
| * | | | | | 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
| * | | | | | Small outside aside shrink sidebar button for mobile only.Jacob Schatz2016-03-042-1/+14
| * | | | | | Open sidebar button on mobile.Jacob Schatz2016-03-044-6/+25
| * | | | | | Move static icon and change appearance.Jacob Schatz2016-03-044-13/+29
| * | | | | | Hide correct author info in header of issuable.Jacob Schatz2016-03-042-4/+10
| * | | | | | Change icons for open close on issue/MRJacob Schatz2016-03-046-21/+46
* | | | | | | No options please.Sytse Sijbrandij2016-03-041-1/+2
* | | | | | | Merge branch 'rs-frontmatter-pre' into 'master' Robert Speicher2016-03-056-0/+110
|\ \ \ \ \ \ \
View Lorry Controller Status