summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into ci/api-variablesDouwe Maan2016-01-1412-75/+377
|\
| * Merge branch 'feature/ldap-sync-edgecases' into 'master' Douwe Maan2016-01-147-51/+173
| |\
| | * fixed LDAP activation on login to use new ldap_blocked statefeature/ldap-sync-edgecasesGabriel Mazetto2016-01-141-3/+2
| | * Codestyle changesGabriel Mazetto2016-01-121-2/+2
| | * Code style fixes and some code simplifiedGabriel Mazetto2016-01-081-1/+1
| | * Repair ldap_blocked state when no ldap identity exist anymoreGabriel Mazetto2016-01-083-0/+87
| | * LDAP synchronization block/unblock new statesGabriel Mazetto2016-01-081-20/+14
| | * Prevent ldap_blocked users from being blocked/unblocked by the APIGabriel Mazetto2016-01-081-5/+18
| | * Prevent ldap_blocked users from being unblocked by the Admin UIGabriel Mazetto2016-01-081-9/+26
| | * Add ldap_blocked as new state to users state machineGabriel Mazetto2016-01-081-16/+28
| * | Merge branch 'fix/private-references' into 'master' Douwe Maan2016-01-142-0/+76
| |\ \
| | * | Fix specs and rubocop warningsfix/private-referencesRémy Coutable2016-01-142-7/+8
| | * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into fix/pri...Rémy Coutable2016-01-138-39/+84
| | |\ \
| | * | | Ensure the API doesn't return notes that the current user shouldn't seeRémy Coutable2016-01-131-0/+51
| | * | | Add spec for Note#cross_reference_not_visible_for?Rémy Coutable2016-01-131-0/+24
| * | | | Move `BroadcastMessage#status` to a helper since it's presentationalRobert Speicher2016-01-132-20/+20
| * | | | Update BroadcastMessage modelRobert Speicher2016-01-132-5/+91
| * | | | Update broadcast_message helperRobert Speicher2016-01-131-12/+30
| * | | | Simplify BroadcastMessage factoryRobert Speicher2016-01-131-6/+7
| * | | | Remove alert_type attribute from BroadcastMessageRobert Speicher2016-01-131-1/+0
| | |/ / | |/| |
* | | | Merge branch '8-4-stable' into ci/api-variablesTomasz Maczukin2016-01-1368-675/+1454
|\ \ \ \ | |/ / /
| * | | Merge branch 'configure-randomize-metrics-sample-interval' into 'master' Yorick Peterse2016-01-131-1/+21
| |\ \ \
| | * | | Randomize metrics sample intervalsconfigure-randomize-metrics-sample-intervalYorick Peterse2016-01-131-1/+21
| * | | | Merge branch 'rs-block-user-before-removal' into 'master' Dmitriy Zaporozhets2016-01-131-0/+16
| |\ \ \ \
| | * | | | Block the reported user before destroying the recordrs-block-user-before-removalRobert Speicher2016-01-121-0/+16
| | |/ / /
| * | | | Merge branch 'rs-time_ago_with_tooltip-conversion' into 'master' Dmitriy Zaporozhets2016-01-131-0/+4
| |\ \ \ \
| | * | | | Make sure time_ago_with_tooltip is using a Time objectrs-time_ago_with_tooltip-conversionRobert Speicher2016-01-121-0/+4
| | |/ / /
| * | | | Merge branch 'comment-and-close-button-does-not-submit-comment' into 'master' Dmitriy Zaporozhets2016-01-131-1/+1
| |\ \ \ \
| | * | | | reverting more MR ajax files, will appear in different commitJacob Schatz2016-01-122-99/+1
| | * | | | fixes conflictsJacob Schatz2016-01-1171-718/+1457
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | adds tests (and passes them) for ajax open and close merge requests.Jacob Schatz2016-01-063-2/+100
| * | | | | Merge branch 'add_username_to_user_system_hooks' of https://github.com/tbeadl...Dmitriy Zaporozhets2016-01-131-16/+16
| |\ \ \ \ \
| | * | | | | Include user_username in user_(add_to/remove_from)_(project/group) system hooks.Tommy Beadle2016-01-071-4/+4
| | * | | | | Include the username in user_create/destroy system hooks.Tommy Beadle2016-01-071-2/+2
| * | | | | | Merge pull request #9952 from tbeadle/user_id_in_member_system_hookDmitriy Zaporozhets2016-01-131-2/+2
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Include the user_id in user_*_team system hooks.Tommy Beadle2016-01-061-2/+2
| | |/ / / /
| * | | | | Merge branch 'remove-application-frames-from-views' into 'master' Yorick Peterse2016-01-122-17/+1
| |\ \ \ \ \
| | * | | | | Stop tracking call stacks for instrumented viewsremove-application-frames-from-viewsYorick Peterse2016-01-122-17/+1
| | | |_|/ / | | |/| | |
| * | | | | Track memory allocated during a transactionYorick Peterse2016-01-121-4/+25
| |/ / / /
| * | | | Merge branch 'fix/ci-linter-sequence-validations' into 'master' Robert Speicher2016-01-111-0/+8
| |\ \ \ \
| | * | | | Allow subsequent validations in CI Linterfix/ci-linter-sequence-validationsGrzegorz Bizon2016-01-111-0/+8
| * | | | | Merge branch 'add-action-to-all-metrics' into 'master' Yorick Peterse2016-01-113-13/+23
| |\ \ \ \ \
| | * | | | | Tag all transaction metrics with an "action" tagYorick Peterse2016-01-113-13/+23
| | |/ / / /
| * | | | | Merge branch 'group-issues-sorting' into 'master' Dmitriy Zaporozhets2016-01-111-6/+6
| |\ \ \ \ \
| | * | | | | Fixed issue sorting specs for ID changesYorick Peterse2016-01-071-6/+6
| * | | | | | Merge branch 'rs-zenmode-cleanup' into 'master' Douwe Maan2016-01-112-21/+14
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Refactor ZenModers-zenmode-cleanupRobert Speicher2016-01-082-21/+14
| * | | | | | Fix Error 500 when visiting build page of project with nil runners_tokenStan Hu2016-01-101-0/+22
| |/ / / / /
| * | | | | Merge branch 'api-project-upload' into 'master' Robert Speicher2016-01-083-16/+33
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | DRY up upload and download servicesapi-project-uploadDouwe Maan2016-01-081-12/+12
View Lorry Controller Status