summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update CHANGELOGfix-todos-countersDouglas Barbosa Alexandre2016-06-171-0/+1
* Ensure Todos counters doesn't count Todos for projects pending deleteDouglas Barbosa Alexandre2016-06-176-25/+52
* Merge branch 'fix-toggling-task-should-not-generate-todo' into 'master' Robert Speicher2016-06-172-19/+40
|\
| * Fix error when editing an issuable with a task listfix-toggling-task-should-not-generate-todoDouglas Barbosa Alexandre2016-06-172-19/+40
* | Merge branch 'secure-request-uris' into 'master' Yorick Peterse2016-06-173-1/+22
|\ \
| * | Filter out sensitive parameters of metrics dataPaco Guzman2016-06-173-1/+22
* | | Merge branch 'update-column-in-batches-where' into 'master' Robert Speicher2016-06-172-53/+80
|\ \ \
| * | | 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-152-5/+3
| * | | Customizing of update_column_in_batches queriesYorick Peterse2016-06-152-41/+66
* | | | Merge branch 'upgrade-ruby-tests-to-23' into 'master' Douwe Maan2016-06-171-43/+38
|\ \ \ \ | |_|/ / |/| | |
| * | | Add master-only limitation.Connor Shea2016-06-171-2/+2
| * | | Remove branch restriction.Connor Shea2016-06-151-2/+2
| * | | Upgrade Ruby 2.2 tests to 2.3connorshea2016-06-151-43/+38
* | | | Merge branch 'contrib-calendar-colors' into 'master' Jacob Schatz2016-06-171-11/+6
|\ \ \ \
| * | | | Fixed issue with user calendar colorscontrib-calendar-colorsPhil Hughes2016-06-131-11/+6
* | | | | Merge branch 'make-spring-optional' into 'master' Douwe Maan2016-06-171-1/+1
|\ \ \ \ \
| * | | | | Use ENABLE_SPRING to use it by defaultmake-spring-optionalKamil Trzcinski2016-06-172-8/+6
| * | | | | Make spring optionalKamil Trzcinski2016-06-171-5/+7
* | | | | | Merge branch '18724-dont-show-leave-project-to-group-member' into 'master' Douwe Maan2016-06-173-2/+21
|\ \ \ \ \ \
| * | | | | | Don't show 'Leave Project' to group members18724-dont-show-leave-project-to-group-memberRémy Coutable2016-06-173-2/+21
| |/ / / / /
* | | | | | Merge branch '14918-add-filter-dropdown-to-tag-page' into 'master' Rémy Coutable2016-06-175-4/+78
|\ \ \ \ \ \
| * | | | | | Add sorting dropdown to tag page14918-add-filter-dropdown-to-tag-pageAlejandro Rodríguez2016-06-165-4/+78
* | | | | | | Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-1769-42/+7239
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'feature/project-import' into 'feature/project-export' Douwe Maan2016-06-1760-63/+6353
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'feature/project-export-ui-experimental' into 'feature/project-i...feature/project-importDouwe Maan2016-06-1745-218/+503
| | |\ \ \ \ \ \ \
| | | * | | | | | | a few changes based on MR feedbackJames Lopez2016-06-176-10/+17
| | | * | | | | | | fixed changelog - [ci skip]feature/project-export-ui-experimentalJames Lopez2016-06-161-9/+0
| | | * | | | | | | fixed merge conflicts on UI branchJames Lopez2016-06-16405-3053/+16766
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | fixed merge conflictsJames Lopez2016-06-16405-3056/+16760
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...feature/project-exportJames Lopez2016-06-16405-3056/+16760
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "squashed merge and fixed conflicts"James Lopez2016-06-16403-16738/+3046
| * | | | | | | | | | squashed merge and fixed conflictsJames Lopez2016-06-16403-3046/+16738
| * | | | | | | | | | fix indentsJames Lopez2016-06-141-5/+5
| | | | * | | | | | | fix spinach testJames Lopez2016-06-161-1/+1
| | | | * | | | | | | 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-1516-64/+105
| | | | * | | | | | | fix annoying specJames Lopez2016-06-151-1/+1
| | | | * | | | | | | fixing specs and some code cleanupJames Lopez2016-06-156-7/+13
| | | | * | | | | | | cleanup namespace check now done by serviceJames Lopez2016-06-151-11/+0
| | | | * | | | | | | enable retry on workerJames Lopez2016-06-151-2/+1
| | | | * | | | | | | fix changelogJames Lopez2016-06-151-2/+1
| | | | * | | | | | | some refactoring - renaming things, etc..James Lopez2016-06-153-8/+8
| | | | * | | | | | | project export archiverJames Lopez2016-06-144-3/+22
| | | | * | | | | | | get rid of old workerJames Lopez2016-06-141-24/+0
| | | | * | | | | | | yay finally importing working with the new services structureJames Lopez2016-06-143-3/+3
| | | | * | | | | | | few fixes after refactoring the whole UI stuffJames Lopez2016-06-145-10/+8
| | | | * | | | | | | adapted current services stuff to use new project import, plus fixes a few is...James Lopez2016-06-148-49/+42
| | | | * | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-141-1/+1
| | | | |\ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |