summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Fix bug in `WikiLinkFilter`.18819-wiki-link-filter-exceptionTimothy Andrew2016-06-181-0/+26
* Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-176-96/+268
|\
| * Merge master into issue_12758issue_12758Felipe Artur2016-06-1742-163/+1063
| |\
| * | Allow users to set custom notifications in projects they don't own and severa...Felipe Artur2016-06-171-3/+0
| * | Re-use notifications dropdown/modal for user profileFelipe Artur2016-06-175-122/+225
| |\ \
| | * | Re-use notifications dropdown on user profileFelipe Artur2016-06-164-117/+199
| | * | Refactor custom notifications controller code and add specsFelipe Artur2016-06-142-0/+44
| | * | Expose notification setting events in APIFelipe Artur2016-06-131-5/+24
| | * | Improve notification settings event keys and add some specsFelipe Artur2016-06-131-6/+50
| * | | Implement custom notification level optionsFelipe Artur2016-06-153-6/+94
* | | | Merge branch 'fix-18717' into 'master' Douwe Maan2016-06-173-0/+119
|\ \ \ \
| * | | | Address Douwe's feedbackfix-18717Rémy Coutable2016-06-172-17/+50
| * | | | Ensure group/project owners can see their members' access_levelRémy Coutable2016-06-171-0/+48
| * | | | Group owner cannot request access to a project of their groupRémy Coutable2016-06-172-0/+38
* | | | | Merge branch 'issuable-todo-improvements'Douwe Maan2016-06-182-0/+112
|\ \ \ \ \
| * | | | | Removed update methodissuable-todo-improvementsPhil Hughes2016-06-171-86/+80
| * | | | | Added todo controller tests for merge requestsPhil Hughes2016-06-171-37/+90
| * | | | | Correctly checks if user is logged in when adding todoPhil Hughes2016-06-171-0/+13
| * | | | | Improved manual todosPhil Hughes2016-06-172-0/+52
| |/ / / /
* | | | | 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
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |