summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/import-hooks' into 'master' Rémy Coutable2017-02-165-32/+49
|\
| * fix tmpdirfix/import-hooksJames Lopez2017-02-161-1/+1
| * Use gitlab shell import instead of manually creating the webhooksJames Lopez2017-02-165-32/+49
* | Merge branch 'paginate-environments-bundle' into 'master' Fatih Acet2017-02-1641-1378/+1884
|\ \
| * \ Merge branch 'fe-paginated-environments-api' into 'paginate-environments-bund...paginate-environments-bundleFilipa Lacerda2017-02-1641-1378/+1884
| |\ \
| | * \ Merge branch 'fe-paginated-environments-api-add-pagination' into 'fe-paginate...Filipa Lacerda2017-02-1623-255/+1006
| | |\ \
| | | * \ Merge branch 'fe-paginated-environments-api-add-subview' into 'fe-paginated-e...Filipa Lacerda2017-02-1619-257/+851
| | | |\ \
| | | | * | Remove arrow icon from foldersFilipa Lacerda2017-02-161-1/+0
| | | | * | Create util to handle pagination transformationFilipa Lacerda2017-02-164-18/+41
| | | | * | Changes after reviewFilipa Lacerda2017-02-163-13/+14
| | | | * | Merge branch 'fe-paginated-environments-api-add-pagination' into fe-paginated...Filipa Lacerda2017-02-164-5/+13
| | | | |\ \ | | | | |/ / | | | |/| |
| | | * | | Changes after reviewfe-paginated-environments-api-add-paginationFilipa Lacerda2017-02-161-2/+10
| | | * | | Rename storePagination to setPaginationFilipa Lacerda2017-02-163-3/+3
| | | | * | Fix broken testsfe-paginated-environments-api-add-subviewFilipa Lacerda2017-02-165-77/+98
| | | | * | Adds Changelog entryFilipa Lacerda2017-02-151-0/+4
| | | | * | Moves check for latest key to store instead of poluting the view making it re...Filipa Lacerda2017-02-153-100/+112
| | | | * | Move change page param to utility functionFilipa Lacerda2017-02-159-72/+328
| | | | * | Use common util to get parameter nameFilipa Lacerda2017-02-152-22/+9
| | | | * | Fix underline styleFilipa Lacerda2017-02-151-0/+1
| | | | * | Adds url for folder;Filipa Lacerda2017-02-155-96/+59
| | | | * | First iterationFilipa Lacerda2017-02-155-0/+268
| | | | * | Extracts table into a reusable componentFilipa Lacerda2017-02-155-26/+85
| | | |/ /
| | | * | Merge branch 'fe-paginated-environments-api' into fe-paginated-environments-a...Filipa Lacerda2017-02-151-3/+4
| | | |\ \ | | | |/ / | | |/| |
| | * | | Add count keys to response JSONfe-paginated-environments-apiZ.J. van de Weg2017-02-151-3/+4
| | | * | Add pagination tests for environments tableFilipa Lacerda2017-02-123-27/+62
| | | * | Remove spec checking for scope 'all' since it's no longer part of componentFilipa Lacerda2017-02-123-11/+13
| | | * | Integrates pagination component with APIFilipa Lacerda2017-02-127-34/+100
| | | * | Verify `latest` key is present when neededFilipa Lacerda2017-02-121-0/+12
| | | * | Adds pagination componentFilipa Lacerda2017-02-122-2/+36
| | |/ /
| | * | Fix typoFilipa Lacerda2017-02-122-13/+13
| | * | Fix broken pathFilipa Lacerda2017-02-121-25/+83
| | * | Merge branch 'master' into fe-paginated-environments-apiFilipa Lacerda2017-02-12183-9908/+1061
| | |\ \
| | * | | Fix pagination headers in grouped environments APIGrzegorz Bizon2017-02-102-9/+25
| | * | | Fix broken test and linter errorFilipa Lacerda2017-02-092-2/+2
| | * | | Add route for environment folder and expose an APIGrzegorz Bizon2017-02-092-0/+22
| | * | | Use CJS in all environments componentsFilipa Lacerda2017-02-0916-817/+782
| | * | | Use CJS in environments serviceFilipa Lacerda2017-02-092-19/+7
| | * | | Use CJS for tests.Filipa Lacerda2017-02-095-36/+36
| | * | | Remove store from global namespace, use CSJ insteadFilipa Lacerda2017-02-094-76/+65
| | * | | Resolve 500 errorFilipa Lacerda2017-02-092-2/+1
| | * | | Remove pagination from this MRFilipa Lacerda2017-02-091-1/+0
| | * | | Environments folder should be underlined when on hover and on focus like a re...Filipa Lacerda2017-02-091-1/+0
| | * | | Adjustments for the new response with countersFilipa Lacerda2017-02-093-5/+27
| | * | | Add support for environment scopes in controllerGrzegorz Bizon2017-02-092-18/+60
| | * | | Adjustments to receive new data schemaFilipa Lacerda2017-02-097-576/+219
| | * | | Enable grouping and pagination in environmnets APIGrzegorz Bizon2017-02-092-9/+21
* | | | | Merge branch '28176_merge_widget_fix' into 'master' Sean McGivern2017-02-163-6/+13
|\ \ \ \ \
| * | | | | Fix error in MR widget after /merge slash commandJarka Kadlecova2017-02-163-6/+13
* | | | | | Merge branch 'docs/broken-anchor-links' into 'master' Achilleas Pipinellis2017-02-161-4/+4
|\ \ \ \ \ \
| * | | | | | Do not use single quote in headings as it breaks docs.gitlab.comAchilleas Pipinellis2017-02-161-4/+4
| | |/ / / / | |/| | | |