summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make `ChangePersonalAccessTokensDefaultBackToEmptyArray` a "post" migration.20492-access-token-scopesTimothy Andrew2016-12-161-2/+4
* Rename the `token_has_scope?` method.Timothy Andrew2016-12-161-3/+3
* Convert AccessTokenValidationService into a class.Timothy Andrew2016-12-164-30/+28
* View-related (and other minor) changes to !5951 based on @rymai's review.Timothy Andrew2016-12-169-52/+48
* Add a controller spec for personal access tokens.Timothy Andrew2016-12-162-40/+60
* Modify `ApiHelpers` spec to adhere to the Four-Phase test style.Timothy Andrew2016-12-161-0/+12
* Refactor access token validation in `Gitlab::Auth`Timothy Andrew2016-12-161-2/+10
* Move the scopes form/list view into a partial.Timothy Andrew2016-12-166-30/+19
* Implement minor changes from @dbalexandre's review.Timothy Andrew2016-12-1610-67/+28
* Update CHANGELOGTimothy Andrew2016-12-161-0/+4
* Validate access token scopes in `Gitlab::Auth`Timothy Andrew2016-12-163-11/+51
* Calls to the API are checked for scope.Timothy Andrew2016-12-1612-92/+164
* Allow creating personal access tokens / OAuth applications with scopes.Timothy Andrew2016-12-1612-24/+138
* Add a `scopes` column to the `personal_access_tokens` tableTimothy Andrew2016-12-165-0/+79
* Merge branch 'fix-master-eslint-errors' into 'master' Douglas Barbosa Alexandre2016-12-164-10/+10
|\
| * Fix eslint errorsfix-master-eslint-errorsAlfredo Sumaran2016-12-154-10/+10
* | Merge branch 'fix/build' into 'master' Douglas Barbosa Alexandre2016-12-161-1/+1
|\ \
| * | Fix spec/features/admin/admin_active_tab_spec.rbfix/buildDouglas Barbosa Alexandre2016-12-151-1/+1
* | | Merge branch 'katex-math-fixup' into 'master' Sean McGivern2016-12-161-4/+0
|\ \ \ | |/ / |/| |
| * | Don't open Asciidoc module twiceMunken2016-12-151-4/+0
* | | Merge branch 'docs/add-okta-auth' into 'master' Achilleas Pipinellis2016-12-154-1/+162
|\ \ \ | |_|/ |/| |
| * | Add Okta authentication documentationdocs/add-okta-authAchilleas Pipinellis2016-12-154-1/+162
* | | Merge branch 'ha_docs_auto_migrate_false' into 'master' Achilleas Pipinellis2016-12-152-7/+7
|\ \ \
| * | | Add `gitlab_rails['auto_migrate'] = false` to HA docs for Redis/PG [ci skip]Drew Blessing2016-12-152-7/+7
* | | | Merge branch '25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs...Kamil Trzciński2016-12-153-12/+12
|\ \ \ \
| * | | | Rename `issue create` slash command to `issue new`25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs-better-documentationPedro Moreira da Silva2016-12-152-2/+2
| * | | | Merge branch '25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs...Pedro Moreira da Silva2016-12-150-0/+0
| |\ \ \ \
| | * | | | Add changelog for !7850.Pedro Moreira da Silva2016-12-071-0/+4
| | * | | | Update Mattermost slash commands docs to explain how to create a newline and ...Pedro Moreira da Silva2016-11-301-11/+7
| | * | | | Improve `issue create …` slash command with user input keys to create a new...Pedro Moreira da Silva2016-11-301-1/+1
| * | | | | Add changelog for !7850.Pedro Moreira da Silva2016-12-151-0/+4
| * | | | | Update Mattermost slash commands docs to explain how to create a newline and ...Pedro Moreira da Silva2016-12-151-11/+7
| * | | | | Improve `issue create …` slash command with user input keys to create a new...Pedro Moreira da Silva2016-12-151-1/+1
* | | | | | Merge branch '24877-bulk-edit-only-keeps-common-labels-when-searching' into '...Fatih Acet2016-12-158-127/+199
|\ \ \ \ \ \
| * | | | | | Address feedback24877-bulk-edit-only-keeps-common-labels-when-searchingAlfredo Sumaran2016-12-144-17/+23
| * | | | | | Remove unwanted semicolonAlfredo Sumaran2016-12-141-1/+1
| * | | | | | Add changelog fileAlfredo Sumaran2016-12-142-1/+5
| * | | | | | Improve issuable's bulk assignment implementationAlfredo Sumaran2016-12-147-123/+185
* | | | | | | Merge branch '25617-todos-filter-placeholder' into 'master' Annabel Dunstone Gray2016-12-152-3/+7
|\ \ \ \ \ \ \
| * | | | | | | 25617 Fix placeholder color of todo filters25617-todos-filter-placeholdertauriedavis2016-12-142-3/+7
* | | | | | | | Merge branch '24824-dropdown-items-focus' into 'master' Annabel Dunstone Gray2016-12-152-1/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | 24824 Add focus state to dropdowns24824-dropdown-items-focustauriedavis2016-12-142-1/+4
* | | | | | | | | Merge branch 'show-commit-status-from-latest-pipeline' into 'master' Grzegorz Bizon2016-12-158-33/+105
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add explicit status test, feedback:show-commit-status-from-latest-pipelineLin Jen-Shin2016-12-152-0/+4
| * | | | | | | | | Don't call anything on a block, use simple ifLin Jen-Shin2016-12-151-4/+6
| * | | | | | | | | Use described_class and update descriptionLin Jen-Shin2016-12-152-10/+10
| * | | | | | | | | Also use latest_status, feedback:Lin Jen-Shin2016-12-151-2/+1
| * | | | | | | | | Introduce latest_status and add a few testsLin Jen-Shin2016-12-145-5/+66
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into show-commit-status-from-l...Lin Jen-Shin2016-12-1458-170/+1125
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into show-commit-status-from-l...Lin Jen-Shin2016-12-141149-9696/+20121
| |\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status