summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add docs for request profilingfix/request-profiler-docsAhmad Sherif2016-10-146-1/+20
* Merge branch 'gitlab-workhorse-0.8.5' into 'master' Rémy Coutable2016-10-143-3/+3
|\
| * Use gitlab-workhorse 0.8.5Nick Thomas2016-10-143-3/+3
* | Merge branch 'remove-period' into 'master' Rémy Coutable2016-10-141-1/+1
|\ \
| * | remove a period that can be annoyingremove-periodDe Wet Blomerus2016-10-141-1/+1
* | | Merge branch 'fix-banzai-renderer-instrumentation' into 'master' Yorick Peterse2016-10-142-3/+2
|\ \ \
| * | | Use module_function in Banzai::Rendererfix-banzai-renderer-instrumentationYorick Peterse2016-10-142-3/+2
* | | | Merge branch 'dz-fix-user-select' into 'master' Jacob Schatz2016-10-140-0/+0
|\ \ \ \
* \ \ \ \ Merge branch 'dz-fix-user-select'Dmitriy Zaporozhets2016-10-141-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Validate user id for users select autcompletedz-fix-user-selectDmitriy Zaporozhets2016-10-141-0/+4
| | |_|/ | |/| |
* | | | Merge branch 'cs-really-fix-spinach'Kamil Trzcinski2016-10-143-2/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Try to fix re-runcs-really-fix-spinachKamil Trzcinski2016-10-141-0/+2
| * | | Fix retriesKamil Trzcinski2016-10-141-1/+1
| * | | Re-run specs if failedKamil Trzcinski2016-10-143-1/+5
| * | | Remove spinach retry.Connor Shea2016-10-144-6/+2
* | | | Merge branch 'issue-23306-fix' into 'master' Dmitriy Zaporozhets2016-10-144-42/+60
|\ \ \ \
| * | | | Move edit group scenario to rspec and refactor groups_specDmitriy Zaporozhets2016-10-144-54/+42
| * | | | Add specs for group edit and deletionissue-23306-fixStan Hu2016-10-141-0/+26
| * | | | Add missing routes to make group edits workStan Hu2016-10-131-0/+4
* | | | | Merge branch 'members-ui' into 'master' Fatih Acet2016-10-1435-246/+458
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Tweaked position of badge in panel headingsmembers-uiPhil Hughes2016-10-133-1/+10
| * | | | Moved how we remove event listenersPhil Hughes2016-10-131-10/+3
| * | | | Changed jQuery to be in single linePhil Hughes2016-10-062-6/+1
| * | | | Changed how collections are renderedPhil Hughes2016-10-068-824/+15
| * | | | Merge branch 'master' into members-uiPhil Hughes2016-10-06246-1916/+5685
| |\ \ \ \
| * | | | | Updated Ruby variable namePhil Hughes2016-10-053-9/+7
| * | | | | Updated RubyPhil Hughes2016-10-042-3/+4
| * | | | | Merge branch 'master' into members-uiPhil Hughes2016-10-04731-4578/+16663
| |\ \ \ \ \
| * | | | | | Border instead of hrPhil Hughes2016-10-042-2/+6
| * | | | | | Admin group members UI fixPhil Hughes2016-09-131-1/+1
| * | | | | | Group links search test fixPhil Hughes2016-09-131-0/+4
| * | | | | | Added back orderingPhil Hughes2016-09-131-0/+1
| * | | | | | Ruby updatePhil Hughes2016-09-133-10/+10
| * | | | | | Removed group members from the list for nowPhil Hughes2016-09-131-25/+0
| * | | | | | Fixed jQuery chainingPhil Hughes2016-09-131-6/+4
| * | | | | | Fixed group_links expire date not updating in viewPhil Hughes2016-09-132-2/+2
| * | | | | | Fixed bug when group_ids not present when creatingPhil Hughes2016-09-131-9/+11
| * | | | | | Search project groupsPhil Hughes2016-09-132-8/+61
| * | | | | | Fixed removing groupsPhil Hughes2016-09-133-2/+17
| * | | | | | Expires in test updatePhil Hughes2016-09-131-1/+1
| * | | | | | Fixed fields not being sentPhil Hughes2016-09-131-2/+3
| * | | | | | CSS cleanupPhil Hughes2016-09-136-15/+7
| * | | | | | JS updatePhil Hughes2016-09-131-9/+11
| * | | | | | Added test for updating groups permissionsPhil Hughes2016-09-133-4/+41
| * | | | | | Fixed error when updating groupsPhil Hughes2016-09-131-1/+1
| * | | | | | Fixed group testsPhil Hughes2016-09-132-2/+2
| * | | | | | Updated some specsPhil Hughes2016-09-136-24/+24
| * | | | | | Updated groups member UI to matchPhil Hughes2016-09-136-60/+38
| * | | | | | Added import button back inPhil Hughes2016-09-132-3/+3
| * | | | | | Tests updatePhil Hughes2016-09-138-15/+16
View Lorry Controller Status