summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'expose-deployment-variables' into 'master' 25743-clean-up-css-for-project-alerts-and-flash-notificationsKamil Trzciński2016-12-1610-1/+116
|\
| * Pass variables from deployment project services to CI runnerexpose-deployment-variablesAdam Niedzielski2016-12-1610-1/+116
* | Merge branch '20492-access-token-scopes' into 'master' Rémy Coutable2016-12-1635-149/+444
|\ \
| * | 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 '22604-manual-actions' into 'master' Grzegorz Bizon2016-12-1619-296/+434
|\ \ \
| * | | Fix broken test22604-manual-actionsFilipa Lacerda2016-12-161-1/+1
| * | | Merge branch 'master' into 22604-manual-actionsFilipa Lacerda2016-12-1672-337/+1198
| |\ \ \ | | |/ /
| * | | Changes after reviewFilipa Lacerda2016-12-155-68/+62
| * | | Merge branch 'master' into '22604-manual-actions'Filipa Lacerda2016-12-15438-868/+12310
| |\ \ \
| * | | | Fix testsFilipa Lacerda2016-12-151-10/+29
| * | | | Fix scss linter errorFilipa Lacerda2016-12-151-2/+2
| * | | | Fix dropdown hoverFilipa Lacerda2016-12-151-3/+9
| * | | | Changes after reviewFilipa Lacerda2016-12-141-0/+5
| * | | | Fix firefox bugFilipa Lacerda2016-12-141-2/+7
| * | | | Simplify graph status badge partial and require localsGrzegorz Bizon2016-12-141-11/+11
| * | | | Remove duplicate color variableFilipa Lacerda2016-12-142-5/+7
| * | | | Fix extension in fileFilipa Lacerda2016-12-141-0/+0
| * | | | css changes @dimitrieh v1Dimitrie Hoekstra2016-12-143-5/+26
| * | | | Fix broken testsFilipa Lacerda2016-12-141-3/+3
| * | | | Changes after reviewFilipa Lacerda2016-12-142-8/+1
| * | | | Rename file according to reviewFilipa Lacerda2016-12-143-2/+4
| * | | | Fix scss errorFilipa Lacerda2016-12-141-7/+8
| * | | | Merge two partials into one. Rename it to match the other partialsFilipa Lacerda2016-12-145-21/+20
| * | | | Remove unused fileFilipa Lacerda2016-12-141-12/+0
| * | | | Merge branch 'master' into 22604-manual-actionsGrzegorz Bizon2016-12-14248-1066/+3983
| |\ \ \ \
| * | | | | Fix graph stroke positionFilipa Lacerda2016-12-131-1/+1
| * | | | | Remove unneeded partialFilipa Lacerda2016-12-134-22/+2
| * | | | | Replace old icons with new onesFilipa Lacerda2016-12-1317-16/+8
| * | | | | Fix pipeline stroke positionFilipa Lacerda2016-12-121-1/+1
| * | | | | Fix vertical alignment of action icon with status iconFilipa Lacerda2016-12-122-26/+19
| * | | | | Adds new partial for graph icons.Filipa Lacerda2016-12-097-8/+27
| * | | | | Merge branch 'master' into 22604-manual-actionsGrzegorz Bizon2016-12-09119-443/+1534
| |\ \ \ \ \
| * | | | | | Renders new icons for the pipeline graphFilipa Lacerda2016-12-0812-46/+25
| * | | | | | Merge branch 'build-statuses' into 22604-manual-actionsKamil Trzcinski2016-12-080-0/+0
| |\ \ \ \ \ \
| | * | | | | | Revert some unneeded changesKamil Trzcinski2016-12-081-1/+1
| | * | | | | | Add action_class/action_titleKamil Trzcinski2016-12-085-3/+30
| | * | | | | | Rename icon_with_label to icon_with_descriptionKamil Trzcinski2016-12-088-8/+9