summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge master into issue_12758issue_12758Felipe Artur2016-06-17208-1565/+11605
|\
| * Merge branch 'fix/error-when-job-variables-not-defined-but-specified' into 'm...Rémy Coutable2016-06-173-18/+41
| |\
| | * Add Changelog entry for CI job variables config fixfix/error-when-job-variables-not-defined-but-specifiedGrzegorz Bizon2016-06-171-0/+1
| | * Fix error when CI job variables not specifiedGrzegorz Bizon2016-06-172-18/+40
| * | Merge branch 'make-sure-that-artifacts-file-is-saved' into 'master' Rémy Coutable2016-06-172-0/+13
| |\ \
| | * | Make sure that artifacts_file is nullified after removing artifactsmake-sure-that-artifacts-file-is-savedKamil Trzcinski2016-06-172-0/+13
| | |/
| * | Merge branch 'validate-only-except-regexp' into 'master' Rémy Coutable2016-06-174-5/+80
| |\ \
| | * | Validate only and except regexpvalidate-only-except-regexpKamil Trzcinski2016-06-174-5/+80
| | |/
| * | Merge branch '2979-personal-access-tokens' into 'master' Douwe Maan2016-06-1719-56/+533
| |\ \
| | * | Fix `api_helpers_spec`2979-personal-access-tokensTimothy Andrew2016-06-161-6/+6
| | * | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-16361-2732/+15925
| | |\ \
| | * | | Implement @DouweM's feedback.Timothy Andrew2016-06-167-42/+22
| | * | | Fix rubocop spec.Timothy Andrew2016-06-141-1/+1
| | * | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-14501-1099/+2637
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-1076-294/+567
| | |\ \ \ \
| | * | | | | Implement second round of comments from @jschatz1.Timothy Andrew2016-06-103-6/+18
| | * | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-09453-3734/+11027
| | |\ \ \ \ \
| | * | | | | | Implement @jschatz1's comments.Timothy Andrew2016-06-095-38/+48
| | * | | | | | Fix rubocop spec.Timothy Andrew2016-06-033-6/+6
| | * | | | | | Add tests for errors while creating/revoking personal access tokens.Timothy Andrew2016-06-031-2/+31
| | * | | | | | Update CHANGELOG.Timothy Andrew2016-06-031-1/+1
| | * | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-031072-5154/+19151
| | |\ \ \ \ \ \
| | * | | | | | | Display appropriate errors when personal access token creation/revocation fails.Timothy Andrew2016-06-032-3/+11
| | * | | | | | | Fix minor styling issues.Timothy Andrew2016-06-031-9/+10
| | * | | | | | | Parts of spec names with "when" should be contexts.Timothy Andrew2016-06-031-18/+27
| | * | | | | | | Don't use `natve['innerHTML']` in the feature spec.Timothy Andrew2016-06-031-11/+11
| | * | | | | | | Only show a personal access token right after its creation.Timothy Andrew2016-06-024-27/+42
| | * | | | | | | Fix minor issues with the personal access tokens implementation.Timothy Andrew2016-06-012-10/+8
| | * | | | | | | Don't look for personal access tokens in the DB when the parameter/header is ...Timothy Andrew2016-06-011-1/+1
| | * | | | | | | Perform private token and personal access token authentication in the same `b...Timothy Andrew2016-06-012-67/+63
| | * | | | | | | Minor fixes after a final look at the diff.Timothy Andrew2016-05-113-10/+6
| | * | | | | | | Reuse the private token param and header for personal access tokens.Timothy Andrew2016-05-114-8/+8
| | * | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-05-11446-4281/+5115
| | |\ \ \ \ \ \ \
| | * | | | | | | | Add documentation for personal access tokens.Timothy Andrew2016-04-281-24/+37
| | * | | | | | | | Address @DouweM's feedback on !3749.Timothy Andrew2016-04-286-29/+35
| | * | | | | | | | Update CHANGELOG.Timothy Andrew2016-04-281-0/+1
| | * | | | | | | | Combine `API::Helpers::Core` and `API::Helpers::Authentication` back into `AP...Timothy Andrew2016-04-287-430/+420
| | * | | | | | | | Make fixes based on @vsizov's comments on MR !3749Timothy Andrew2016-04-283-7/+3
| | * | | | | | | | Merge the "personal access token"-related migrations.Timothy Andrew2016-04-283-10/+2
| | * | | | | | | | Improve performance of the personal access tokens page.Timothy Andrew2016-04-281-6/+6
| | * | | | | | | | Remove unnecessary javascript from the datepicker initialization.Timothy Andrew2016-04-281-2/+13
| | * | | | | | | | Add feature specs for personal access token management.Timothy Andrew2016-04-282-2/+54
| | * | | | | | | | Change the root param while creating personal access tokens.Timothy Andrew2016-04-282-2/+5
| | * | | | | | | | Fix rubocop complaints.Timothy Andrew2016-04-282-11/+11
| | * | | | | | | | Remove an unused view file.Timothy Andrew2016-04-281-2/+0
| | * | | | | | | | Refactor `authenticate_user_from_private_token!`Timothy Andrew2016-04-281-7/+1
| | * | | | | | | | Authenticate non-API requests with personal access tokens.Timothy Andrew2016-04-282-2/+83
| | * | | | | | | | Add an "Inactive Personal Access Tokens" section.Timothy Andrew2016-04-284-17/+49
| | * | | | | | | | Add an entry for Personal Access Tokens in the sidebar.Timothy Andrew2016-04-282-1/+6
| | * | | | | | | | Allow expiration of personal access tokens.Timothy Andrew2016-04-287-20/+94
View Lorry Controller Status