summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'limit-email-diff-size' into 'master' Robert Speicher2016-06-201-1/+1
|\
| * Limit push email diff sizelimit-email-diff-sizeSean McGivern2016-06-171-1/+1
* | use rails root joinJames Lopez2016-06-201-1/+1
* | fixed a couple of errors spotted in productionJames Lopez2016-06-201-1/+1
* | Fix RangeError exceptions when referring to issues or merge requests outside ...Stan Hu2016-06-181-0/+5
* | Listing GH Webhooks doesn't stop import process for non GH admin usersDouglas Barbosa Alexandre2016-06-171-5/+18
* | Track method call times/counts as a single metricYorick Peterse2016-06-173-22/+84
* | 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-1619-59/+379
| |\ \ \
| | * \ \ fixed merge conflictsJames Lopez2016-06-1619-59/+379
| | |\ \ \
| | | * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...feature/project-exportJames Lopez2016-06-1619-59/+379
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Revert "squashed merge and fixed conflicts"James Lopez2016-06-1619-379/+59
| | | * | | squashed merge and fixed conflictsJames Lopez2016-06-1619-59/+379
| * | | | | 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
| * | | | | WIP - starting refactoring import/export to use servicesJames Lopez2016-06-132-3/+30
| * | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-06-133-33/+39
| |\ \ \ \ \ | | |/ / / /
| | * | | | refactored notes logicJames Lopez2016-06-131-3/+5
| | * | | | few more changes based on feedbackJames Lopez2016-06-133-16/+25
| | * | | | addressing MR feedback, few changes to members mapperJames Lopez2016-06-131-15/+10
| * | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-133-3/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | corrected a few warningsJames Lopez2016-06-133-3/+3
| * | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-1370-515/+1227
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-131-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | fixed deprecation warningJames Lopez2016-06-131-1/+1
| | * | | | fixed specs and refactored a few things due to recent model changes and merge...James Lopez2016-06-132-8/+3
| | * | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-1361-370/+1085
| | |\ \ \ \ | | | |/ / /
View Lorry Controller Status