summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into ci-lfs-fetchKamil Trzcinski2016-06-2172-260/+2136
|\
| * use rails root joinJames Lopez2016-06-201-1/+1
| * fixed a couple of errors spotted in productionJames Lopez2016-06-201-1/+1
| * Merge branch 'fix-out-of-bounds-markdown-refs' into 'master' Robert Speicher2016-06-182-1/+7
| |\
| | * Fix RangeError exceptions when referring to issues or merge requests outside ...Stan Hu2016-06-182-1/+7
| * | Fix bug in `WikiLinkFilter`.18819-wiki-link-filter-exceptionTimothy Andrew2016-06-181-1/+1
| |/
| * Merge branch 'gh-webhooks' into 'master' Robert Speicher2016-06-171-5/+18
| |\
| | * Listing GH Webhooks doesn't stop import process for non GH admin usersDouglas Barbosa Alexandre2016-06-171-5/+18
| * | Add endpoints for award emoji on notesZ.J. van de Weg2016-06-172-69/+83
| * | Sort API endpoints and implement feedbackZ.J. van de Weg2016-06-174-35/+40
| * | Add endpoints for Award EmojiZ.J. van de Weg2016-06-174-1/+107
| |/
| * Merge branch 'track-total-method-call-time' into 'master' Robert Speicher2016-06-173-22/+84
| |\
| | * Track method call times/counts as a single metricYorick Peterse2016-06-173-22/+84
| * | Merge branch 'sidekiq-api-metrics' into 'master' Achilleas Pipinellis2016-06-172-0/+91
| |\ \ | | |/ | |/|
| | * Added missing mount point for Sidekiq Metrics API, after it got lost on rebase.Patricio Cano2016-06-171-0/+1
| | * Fixed Rubocop errorPatricio Cano2016-06-171-0/+90
| * | Merge branch 'registry-500-fix' into 'master' Rémy Coutable2016-06-171-3/+8
| |\ \
| | * | Use response_bodyKamil Trzcinski2016-06-171-6/+7
| | * | Fix regression introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_re...registry-500-fixKamil Trzcinski2016-06-171-3/+7
| * | | Merge branch 'secure-request-uris' into 'master' Yorick Peterse2016-06-171-1/+5
| |\ \ \
| | * | | Filter out sensitive parameters of metrics dataPaco Guzman2016-06-171-1/+5
| | | |/ | | |/|
| * | | Merge branch 'update-column-in-batches-where' into 'master' Robert Speicher2016-06-171-52/+67
| |\ \ \ | | |/ / | |/| |
| | * | Fix update_column_in_batches to update all rowsYorick Peterse2016-06-171-23/+27
| | * | Don't update columns in batches in a transactionYorick Peterse2016-06-151-4/+2
| | * | Customizing of update_column_in_batches queriesYorick Peterse2016-06-151-41/+54
| * | | Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-1725-5/+1044
| |\ \ \
| | * | | a few changes based on MR feedbackJames Lopez2016-06-171-1/+1
| | * | | fixed merge conflicts on UI branchJames Lopez2016-06-1632-118/+493
| | |\ \ \
| | | * \ \ fixed merge conflictsJames Lopez2016-06-1632-118/+493
| | | |\ \ \
| | | | * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...feature/project-exportJames Lopez2016-06-1632-118/+493
| | | | |\ \ \
| | | | * | | | Revert "squashed merge and fixed conflicts"James Lopez2016-06-1631-490/+110
| | | | * | | | squashed merge and fixed conflictsJames Lopez2016-06-1631-110/+490
| | * | | | | | fix wiki stuffJames Lopez2016-06-161-2/+1
| | * | | | | | fix specsJames Lopez2016-06-161-1/+1
| | * | | | | | lots of refactoring again based on feedback. Changed the UI slightly and also...James Lopez2016-06-153-3/+4
| | * | | | | | yay finally importing working with the new services structureJames Lopez2016-06-141-2/+2
| | * | | | | | few fixes after refactoring the whole UI stuffJames Lopez2016-06-143-6/+4
| | * | | | | | adapted current services stuff to use new project import, plus fixes a few is...James Lopez2016-06-144-33/+21
| | * | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-141-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | fix merge issueJames Lopez2016-06-141-1/+1
| | * | | | | | adding notifications stuff and more refactoring for exporting projectsJames Lopez2016-06-142-23/+21
| | * | | | | | new export stuff and viewJames Lopez2016-06-141-1/+1
| | * | | | | | lots of refactoring to reuse import serviceJames Lopez2016-06-147-161/+109
| | * | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-146-9/+8
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | updated relation_factory based on MR feedbackJames Lopez2016-06-141-3/+3
| | | * | | | | fix mergeJames Lopez2016-06-141-1/+1
| | | * | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-144-5/+4
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | missed line breakJames Lopez2016-06-141-0/+1
| | | | * | | | few changes based on MR feedbackJames Lopez2016-06-132-2/+2
| | | | * | | | fix file.writeJames Lopez2016-06-131-3/+1
View Lorry Controller Status