summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fixed LDAP activation on login to use new ldap_blocked statefeature/ldap-sync-edgecasesGabriel Mazetto2016-01-143-6/+4
* Fix Admin/Users view to position buttons without spacing magicGabriel Mazetto2016-01-142-15/+18
* Codestyle changesGabriel Mazetto2016-01-123-6/+6
* Code style fixes and some code simplifiedGabriel Mazetto2016-01-084-12/+16
* Repair ldap_blocked state when no ldap identity exist anymoreGabriel Mazetto2016-01-087-0/+109
* LDAP synchronization block/unblock new statesGabriel Mazetto2016-01-082-23/+17
* Prevent ldap_blocked users from being blocked/unblocked by the APIGabriel Mazetto2016-01-083-11/+30
* Prevent ldap_blocked users from being unblocked by the Admin UIGabriel Mazetto2016-01-084-11/+38
* Add ldap_blocked as new state to users state machineGabriel Mazetto2016-01-082-17/+39
* Merge branch 'suppress-allow-failure-builds' into 'master' Stan Hu2016-01-085-1/+31
|\
| * Suppress e-mails on failed builds if allow_failure is setStan Hu2016-01-075-1/+31
* | Merge branch 'rs-single-item-task-list-spec' into 'master' Douwe Maan2016-01-081-0/+6
|\ \
| * | Add spec for single-item task listsrs-single-item-task-list-specRobert Speicher2016-01-071-0/+6
* | | Merge branch 'issue_3076' into 'master' Drew Blessing2016-01-083-3/+5
|\ \ \
| * | | Fix problem with projects ending with .keys #3076Jose Corcuera2016-01-063-3/+5
* | | | Merge branch 'docs_project_services' into 'master' Achilleas Pipinellis2016-01-0819-97/+180
|\ \ \ \
| * | | | Add JIRA 7 to the supported versionsdocs_project_servicesAchilleas Pipinellis2016-01-081-0/+6
| * | | | Remove useless assignment to variableAchilleas Pipinellis2016-01-081-1/+1
| * | | | Remove reference to EE from JIRA service modelAchilleas Pipinellis2016-01-081-5/+0
| * | | | Clean up the JIRA integration document [ci skip]Achilleas Pipinellis2016-01-089-52/+82
| * | | | Split external issue tracker documentAchilleas Pipinellis2016-01-088-32/+71
| * | | | Clean up integration READMEAchilleas Pipinellis2016-01-081-8/+21
* | | | | Merge branch 'current-settings-handle-missing-db' into 'master' Yorick Peterse2016-01-081-0/+3
|\ \ \ \ \
| * | | | | Handle missing DBs in connect_to_db?Yorick Peterse2016-01-081-0/+3
* | | | | | Merge branch 'api-delete-tag' into 'master' Dmitriy Zaporozhets2016-01-084-0/+63
|\ \ \ \ \ \
| * | | | | | Delete tag via APIapi-delete-tagRobert Schilling2016-01-084-0/+63
* | | | | | | Merge branch 'accept-2xx-status-codes-for-webhooks' into 'master' Dmitriy Zaporozhets2016-01-083-1/+14
|\ \ \ \ \ \ \
| * | | | | | | Accept 2xx status codes for successful Web hook triggersStan Hu2016-01-073-1/+14
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'sorting-dropdown-order' into 'master' Dmitriy Zaporozhets2016-01-081-2/+2
|\ \ \ \ \ \ \
| * | | | | | | changes titlessorting-dropdown-orderJacob Schatz2016-01-072-8/+8
* | | | | | | | Merge branch 'cross-project-reference-move' into 'master' Dmitriy Zaporozhets2016-01-082-10/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | adds 85% width for textcross-project-reference-moveJacob Schatz2016-01-071-1/+1
| * | | | | | | | adds reference to the bottom of sidebarJacob Schatz2016-01-072-10/+19
* | | | | | | | | Merge branch 'banner-out-of-place' into 'master' Dmitriy Zaporozhets2016-01-082-0/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | css change to height to make gray container fitbanner-out-of-placeJacob Schatz2016-01-073-6/+8
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'docs_project_services' into 'master' Achilleas Pipinellis2016-01-081-16/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Update project services to include all supported onesAchilleas Pipinellis2016-01-051-16/+26
* | | | | | | | | Merge branch 'rs-remove-stamp' into 'master' Dmitriy Zaporozhets2016-01-0826-38/+41
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fix feature steprs-remove-stampRobert Speicher2016-01-071-1/+1
| * | | | | | | | Use `xmlschema` where even more appropriate!Robert Speicher2016-01-079-10/+10
| * | | | | | | | Use `to_s(:iso8601)` where appropriateRobert Speicher2016-01-0711-12/+12
| * | | | | | | | Add two custom Date/Time conversion formatsRobert Speicher2016-01-0711-18/+27
| * | | | | | | | Remove stamp gemRobert Speicher2016-01-0712-21/+15
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'give-credit-to-kaiser-soze' into 'master' Stan Hu2016-01-081-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Give credit to user who created find file featuregive-credit-to-kaiser-sozeStan Hu2016-01-071-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'task-list-class' into 'master' Robert Speicher2016-01-072-4/+10
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into task-list-classtask-list-classDouwe Maan2016-01-077-13/+27
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Properly set task-list class on single item task listsDouwe Maan2016-01-072-4/+10
* | | | | | | | Merge branch 'gemfile-lock' into 'master' Robert Speicher2016-01-070-0/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Update Gemfile.lockgemfile-lockDouwe Maan2016-01-071-5/+5
| |/ / / / / /
View Lorry Controller Status