summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'api-endpoints-award-emoji' into 'master' Robert Speicher2016-06-171-0/+198
|\
| * fixup! updated docs for api endpoint award emojiZ.J. van de Weg2016-06-171-1/+1
| * Add endpoints for award emoji on notesZ.J. van de Weg2016-06-171-5/+54
| * Add endpoints for Award EmojiZ.J. van de Weg2016-06-171-0/+149
* | Merge branch 'fix-todos-counters' into 'master' Robert Speicher2016-06-171-0/+4
|\ \
| * | Ensure Todos counters doesn't count Todos for projects pending deleteDouglas Barbosa Alexandre2016-06-171-0/+4
* | | Merge branch 'disable-saml-account-unlink' into 'master' Robert Speicher2016-06-171-0/+26
|\ \ \
| * | | Added CHANGELOG item and fixed Rubocop errorsdisable-saml-account-unlinkPatricio Cano2016-06-141-4/+2
| * | | Disable the unlink feature for SAML connected accounts (social login).Patricio Cano2016-06-141-0/+28
* | | | Merge branch 'repo-check-require-push-events' into 'master' Robert Speicher2016-06-171-0/+29
|\ \ \ \ | |_|/ / |/| | |
| * | | Do not check repos without push eventsJacob Vosmaer2016-06-151-0/+29
* | | | Merge branch '18034-cache-todo-counter' into 'master' Yorick Peterse2016-06-171-0/+54
|\ \ \ \ | |_|_|/ |/| | |
| * | | Cache todo counters (pending/done)18034-cache-todo-counterPaco Guzman2016-06-171-0/+54
* | | | Merge branch 'track-total-method-call-time' into 'master' Robert Speicher2016-06-173-6/+111
|\ \ \ \
| * | | | Track method call times/counts as a single metricYorick Peterse2016-06-173-6/+111
* | | | | Merge branch 'sidekiq-api-metrics' into 'master' Achilleas Pipinellis2016-06-171-0/+40
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed Rubocop errorPatricio Cano2016-06-171-0/+40
* | | | | Merge branch 'registry-500-fix' into 'master' Rémy Coutable2016-06-171-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix regression introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_re...registry-500-fixKamil Trzcinski2016-06-171-1/+1
* | | | | Merge branch 'fix-toggling-task-should-not-generate-todo' into 'master' Robert Speicher2016-06-171-18/+34
|\ \ \ \ \
| * | | | | Fix error when editing an issuable with a task listfix-toggling-task-should-not-generate-todoDouglas Barbosa Alexandre2016-06-171-18/+34
| |/ / / /
* | | | | Merge branch 'secure-request-uris' into 'master' Yorick Peterse2016-06-171-0/+16
|\ \ \ \ \
| * | | | | Filter out sensitive parameters of metrics dataPaco Guzman2016-06-171-0/+16
| | |/ / / | |/| | |
* | | | | Merge branch 'update-column-in-batches-where' into 'master' Robert Speicher2016-06-171-1/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Don't update columns in batches in a transactionYorick Peterse2016-06-151-1/+1
| * | | | Customizing of update_column_in_batches queriesYorick Peterse2016-06-151-0/+12
* | | | | Merge branch '18724-dont-show-leave-project-to-group-member' into 'master' Douwe Maan2016-06-171-0/+17
|\ \ \ \ \
| * | | | | Don't show 'Leave Project' to group members18724-dont-show-leave-project-to-group-memberRémy Coutable2016-06-171-0/+17
| | |/ / / | |/| | |
* | | | | Merge branch '14918-add-filter-dropdown-to-tag-page' into 'master' Rémy Coutable2016-06-171-0/+41
|\ \ \ \ \
| * | | | | Add sorting dropdown to tag page14918-add-filter-dropdown-to-tag-pageAlejandro Rodríguez2016-06-161-0/+41
* | | | | | Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-1710-0/+5774
|\ \ \ \ \ \
| * \ \ \ \ \ fixed merge conflicts on UI branchJames Lopez2016-06-1687-311/+3704
| |\ \ \ \ \ \
| | * \ \ \ \ \ fixed merge conflictsJames Lopez2016-06-1687-311/+3704
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...feature/project-exportJames Lopez2016-06-1687-311/+3704
| | | |\ \ \ \ \ \
| | | * | | | | | | Revert "squashed merge and fixed conflicts"James Lopez2016-06-1686-3686/+309
| | | * | | | | | | squashed merge and fixed conflictsJames Lopez2016-06-1686-309/+3686
| | | * | | | | | | fix indentsJames Lopez2016-06-141-5/+5
| * | | | | | | | | lots of refactoring again based on feedback. Changed the UI slightly and also...James Lopez2016-06-151-2/+2
| * | | | | | | | | fix annoying specJames Lopez2016-06-151-1/+1
| * | | | | | | | | fixing specs and some code cleanupJames Lopez2016-06-153-3/+5
| * | | | | | | | | yay finally importing working with the new services structureJames Lopez2016-06-141-0/+0
| * | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-142-26/+87
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | fix mergeJames Lopez2016-06-141-5/+5
| | * | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-142-26/+87
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | better coverage for ReaderJames Lopez2016-06-141-0/+61
| | | * | | | | | | few changes based on MR feedbackJames Lopez2016-06-131-1/+1
| * | | | | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-06-131-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | few more changes based on feedbackJames Lopez2016-06-131-1/+1
| * | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-13333-3585/+12165
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | fixed specs and refactored a few things due to recent model changes and merge...James Lopez2016-06-131-303/+150