summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '20492-access-token-scopes' into 'master' Rémy Coutable2016-12-1616-66/+139
|\
| * Convert AccessTokenValidationService into a class.Timothy Andrew2016-12-161-20/+18
| * View-related (and other minor) changes to !5951 based on @rymai's review.Timothy Andrew2016-12-168-24/+30
| * 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-165-9/+7
| * Calls to the API are checked for scope.Timothy Andrew2016-12-162-42/+34
| * Allow creating personal access tokens / OAuth applications with scopes.Timothy Andrew2016-12-1611-24/+112
| * Add a `scopes` column to the `personal_access_tokens` tableTimothy Andrew2016-12-161-0/+2
* | Merge branch '22604-manual-actions' into 'master' Grzegorz Bizon2016-12-1616-295/+344
|\ \
| * \ Merge branch 'master' into 22604-manual-actionsFilipa Lacerda2016-12-1619-154/+347
| |\ \ | | |/
| * | Changes after reviewFilipa Lacerda2016-12-154-34/+3
| * | Merge branch 'master' into '22604-manual-actions'Filipa Lacerda2016-12-15241-615/+1118
| |\ \
| * | | 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
| * | | 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-14104-438/+669
| |\ \ \
| * | | | 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-096-5/+24
| * | | | Merge branch 'master' into 22604-manual-actionsGrzegorz Bizon2016-12-0947-172/+349
| |\ \ \ \
| * | | | | Renders new icons for the pipeline graphFilipa Lacerda2016-12-0812-46/+25
| * | | | | Add icon_with_name_and_action and use it everywhereKamil Trzcinski2016-12-084-41/+19
| * | | | | Rename icon_with_label to icon_with_descriptionKamil Trzcinski2016-12-089-9/+10
| * | | | | Fix auto loading of constants for Ci StatusesKamil Trzcinski2016-12-085-15/+16
| * | | | | Merge branch 'build-statuses' into 22604-manual-actionsKamil Trzcinski2016-12-081-0/+6
| |\ \ \ \ \
| | * | | | | Fix some detailed statuses specs related to abilitiesGrzegorz Bizon2016-12-081-0/+6
| * | | | | | Merge branch 'build-statuses' into 22604-manual-actionsGrzegorz Bizon2016-12-0827-147/+161
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Remove ci_status_with_icon helper and replace it with partial [ci skip]Kamil Trzcinski2016-12-088-34/+17
| | * | | | | Improve actionsKamil Trzcinski2016-12-081-0/+4
| | * | | | | Added Ci::Status::BuildKamil Trzcinski2016-12-082-0/+8
| * | | | | | Adds tests for the status and actions icons rendered in the pipeline graphFilipa Lacerda2016-12-071-4/+0
| * | | | | | Adds new icons for pipeline graphFilipa Lacerda2016-12-0711-24/+56
| * | | | | | Adds actions to the nodesFilipa Lacerda2016-12-074-24/+86
| * | | | | | Fix tooltip to show the all nameFilipa Lacerda2016-12-073-275/+231
| * | | | | | Adds new hover stateFilipa Lacerda2016-12-073-10/+33
* | | | | | | Merge branch '25339-2-webhooks-fired-for-issue-closed-and-reopened' into 'mas...Rémy Coutable2016-12-161-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Ensure issuable state changes only fire webhooks onceMark Fletcher2016-12-161-1/+6
View Lorry Controller Status