summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | Creator should be added as a master of the project on creationDouglas Barbosa Alexandre2016-01-202-2/+7
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also enable a project creator to add themselves as a master of the project.
| * | | | | | | | | | | | | Remove Performance Monitoring from Integration docsRobert Speicher2016-01-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | Update CHANGELOGRobert Speicher2016-01-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | Merge branch ↵Dmitriy Zaporozhets2016-01-202-0/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'show-message-to-signed-out-users-to-sign-in-if-they-want-to-comment' into 'master' Adds disabled comment field and disabled avatar. Fixes #3540 ![Screen_Shot_2016-01-20_at_12.13.29_AM](/uploads/673fb783e9aeae441df9c40bfe29ac1b/Screen_Shot_2016-01-20_at_12.13.29_AM.png) See merge request !2508
| | * | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added documentation for GitLab Metrics This adds documentation for the metrics code I recently added. Two notes: * I'm referring to this feature as "GitLab Metrics" everywhere simply because the code resides in the `Gitlab::Metrics` namespace. A different name is fine, though I think just "Metrics" might be a bit too abstract. * Grafana isn't covered since it's fairly straight-forward to setup (there's nothing really special we can cover). I think we _should_ cover it once we start shipping it with Omnibus. I assigned @axil since he's our technical writer/documentation guru, feel free to re-assign if needed. cc @sytses @axil @dzaporozhets @JobV See merge request !2484
| | * | | | | | | | | | | | | Change InfluxDB admin usernameAchilleas Pipinellis2016-01-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | | | | | | | | Move integration/metrics to monitoring/performanceAchilleas Pipinellis2016-01-206-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | | | | | | | | Renamed "Metrics" to "Performance Monitoring"metrics-documentationYorick Peterse2016-01-206-12/+12
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Refactor GitLab Metrics docsAchilleas Pipinellis2016-01-199-146/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | | | | | | | | 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 requests Fixes #12456 See merge request !2523
| | * | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add syntax highlighting to diff view Closes #3945 See merge request !2109
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ 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 commit objects instead of IDs when generating diffs * Use proper references when generating MR's source and target * Update broken specs
| | * | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Refactor highlighting linesDouwe Maan2016-01-141-25/+4
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Remove duplication around highlighting.Douwe Maan2016-01-143-27/+25
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Refactor parallel_diff generation a bit.Douwe Maan2016-01-143-57/+83
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Use #sub instead of #gsub!. #3945Rubén Dávila2016-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This is because is not a good idea to modify the original lines * Also I run into this issue https://gitlab.com/gitlab-org/gitlab_git/issues/14 which is returning Diff Lines with the same @new_pos value.
| | * | | | | | | | | | | | | | | | Use current commit id if it doesn't have a parent. #3945Rubén Dávila2016-01-131-1/+1
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Little refactor for usage of html_safe. #3945Rubén Dávila2016-01-134-9/+10
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Use html_safe instead of raw. #3945Rubén Dávila2016-01-131-2/+2
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Fix broken specs. #3945Rubén Dávila2016-01-122-2/+3
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Add more specs. #3945Rubén Dávila2016-01-121-0/+18
| | | | | | | | | | | | | | | | | |
View Lorry Controller Status