summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix rendering 'active' element in 'Ip Blocking' navigationfeature/check-against-rblTomasz Maczukin2016-01-211-4/+4
* Move abstraction to base controllers in Admin::IpBlocking::Tomasz Maczukin2016-01-2115-230/+163
* Merge branch 'master' into feature/check-against-rblTomasz Maczukin2016-01-21103-491/+1814
|\
| * Merge branch 'new-pagination' into 'master' Jacob Schatz2016-01-219-53/+32
| |\
| | * Removes 100% width because it is a block element.Jacob Schatz2016-01-201-1/+0
| | * Implement new UI for paginationDmitriy Zaporozhets2016-01-209-53/+33
| |/
| * Merge branch 'ui-is-broken-in-search-result-page' into 'master' Dmitriy Zaporozhets2016-01-211-4/+0
| |\
| | * Fix term height so text overflap does not happen.ui-is-broken-in-search-result-pageJacob Schatz2016-01-201-4/+0
| * | Merge branch 'fix-project-creation' into 'master' Robert Speicher2016-01-202-2/+7
| |\ \
| | * | Creator should be added as a master of the project on creationDouglas Barbosa Alexandre2016-01-202-2/+7
| * | | Remove Performance Monitoring from Integration docsRobert Speicher2016-01-201-1/+0
| * | | Update CHANGELOGRobert Speicher2016-01-201-0/+1
| * | | Merge branch 'show-message-to-signed-out-users-to-sign-in-if-they-want-to-com...Dmitriy Zaporozhets2016-01-202-0/+46
| |\ \ \
| | * | | Uses color variables instead.show-message-to-signed-out-users-to-sign-in-if-they-want-to-commentJacob Schatz2016-01-201-3/+3
| | * | | Adds disabled comment field and disabled avatar.Jacob Schatz2016-01-202-0/+46
| * | | | Merge branch 'metrics-documentation' into 'master' Achilleas Pipinellis2016-01-207-0/+384
| |\ \ \ \
| | * | | | Change InfluxDB admin usernameAchilleas Pipinellis2016-01-201-3/+3
| | * | | | Move integration/metrics to monitoring/performanceAchilleas Pipinellis2016-01-206-1/+1
| | * | | | Renamed "Metrics" to "Performance Monitoring"metrics-documentationYorick Peterse2016-01-206-12/+12
| | * | | | Refactor GitLab Metrics docsAchilleas Pipinellis2016-01-199-146/+285
| | * | | | Added documentation for GitLab MetricsYorick Peterse2016-01-185-0/+245
| * | | | | Merge branch 'fix-github-pull-requests-import' into 'master' Robert Speicher2016-01-202-10/+23
| |\ \ \ \ \
| | * | | | | Fix cross projects detection when importing GitHub pull requestsDouglas Barbosa Alexandre2016-01-202-10/+23
| * | | | | | Merge branch 'issue_3945' into 'master' Robert Speicher2016-01-2049-392/+1151
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into issue_3945issue_3945Rubén Dávila2016-01-2010-0/+241
| | |\ \ \ \ \ \
| | * | | | | | | Use a MR with commits.Rubén Dávila2016-01-201-1/+1
| | * | | | | | | Merge branch 'master' into issue_3945Douwe Maan2016-01-2031-32/+159
| | |\ \ \ \ \ \ \
| | * | | | | | | | Validate bounds just to be sureDouwe Maan2016-01-201-0/+3
| | * | | | | | | | Properly highlight lines around '\ No newline at end of file'Douwe Maan2016-01-205-7/+24
| | * | | | | | | | Save and use actual diff base commit for MR diff highlightingDouwe Maan2016-01-2010-32/+75
| | * | | | | | | | Update testsDouwe Maan2016-01-203-3/+3
| | * | | | | | | | Fix MR diff_refsDouwe Maan2016-01-203-4/+4
| | * | | | | | | | Properly handle HTML entities with inline diffsDouwe Maan2016-01-205-20/+24
| | * | | | | | | | Restore helperDouwe Maan2016-01-201-0/+4
| | * | | | | | | | Merge branch 'master' into issue_3945Douwe Maan2016-01-20132-275/+1031
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | * | | | | | | | Move parallel diff logic to separate classDouwe Maan2016-01-208-127/+148
| | * | | | | | | | Check if MR is not broken.Rubén Dávila2016-01-191-1/+1
| | * | | | | | | | Add missing specsDouwe Maan2016-01-191-0/+21
| | * | | | | | | | Don't crash when file can't be highlightedDouwe Maan2016-01-191-9/+3
| | * | | | | | | | Refactor Gitlab::Highlight and fix testsDouwe Maan2016-01-197-135/+131
| | * | | | | | | | Remove useless assignmentsDouwe Maan2016-01-191-2/+0
| | * | | | | | | | Add testsDouwe Maan2016-01-154-0/+53
| | * | | | | | | | Whoops, forgot to add filesDouwe Maan2016-01-152-0/+160
| | * | | | | | | | Move inline diff marker logic to its own classDouwe Maan2016-01-151-95/+11
| | * | | | | | | | Move inline diff logic to its own classDouwe Maan2016-01-151-73/+11
| | * | | | | | | | Method was movedDouwe Maan2016-01-151-2/+2
| | * | | | | | | | Merge branch 'master' into issue_3945Rubén Dávila2016-01-14665-4235/+10115
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | More refactoring from last code review. #3945Rubén Dávila2016-01-1414-296/+366
| | * | | | | | | | | Use the adequate reference for the old rev. #3945Rubén Dávila2016-01-141-1/+1
| | * | | | | | | | | Add inline diff markers in highlighted diffs.Douwe Maan2016-01-147-40/+187