summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-pipelines-pagination-is-gone' into 'master' Alfredo Sumaran2017-02-162-2/+5
|\
| * Renders pagination again for pipelines tableFilipa Lacerda2017-02-162-2/+5
* | Merge branch 'active_when' into 'master' Robert Speicher2017-02-1616-55/+61
|\ \ | |/ |/|
| * Add active_when helperSemyon Pupkov2017-02-1516-55/+61
* | Merge branch '28262-horizontal-scrolling-issue-on-long-project-names' into 'm...Annabel Dunstone Gray2017-02-161-0/+1
|\ \
| * | Wrap long Project and Group titles28262-horizontal-scrolling-issue-on-long-project-namesSam Rose2017-02-161-0/+1
* | | Merge branch '28247-timeloops-bug' into 'master' Clement Ho2017-02-164-50/+33
|\ \ \
| * | | Transforms startTimeAgoLoops into a static method so we can reuse it instead ...Filipa Lacerda2017-02-163-9/+5
| * | | Only run timeago loops after rendering timeago componentsFilipa Lacerda2017-02-164-43/+30
* | | | Merge branch '28253-fix-buid-scroll-button-position' into 'master' Annabel Dunstone Gray2017-02-161-1/+1
|\ \ \ \
| * | | | Fix positioning of top scroll buttonAlfredo Sumaran2017-02-161-1/+1
* | | | | Merge branch '27281-devicon' into 'master'Robert Speicher2017-02-163-1/+5
|\ \ \ \ \
| * | | | | dev favicon is blue, not purple27281-deviconSimon Knox2017-02-162-1/+1
| * | | | | override favicon for development to find tabs more easilySimon Knox2017-02-163-1/+5
* | | | | | Merge branch 'sh-namespace-cleanup-deleted-projects' into 'master' Douwe Maan2017-02-163-3/+15
|\ \ \ \ \ \
| * | | | | | Fix a number of race conditions that can occur during namespace deletionsh-namespace-cleanup-deleted-projectsStan Hu2017-02-153-3/+15
* | | | | | | Merge branch '26957-tanuki-anim-hang' into 'master' Clement Ho2017-02-163-6/+7
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | don't trigger tanuki loader when downloading files26957-tanuki-anim-hangSimon Knox2017-02-163-6/+7
| |/ / / / /
* | | | | | Merge branch '27986-text-spacing' into 'master' Filipa Lacerda2017-02-161-1/+1
|\ \ \ \ \ \
| * | | | | | add space between ci text and commit sha in Merge Request widget27986-text-spacingSimon Knox2017-02-171-1/+1
| |/ / / / /
* | | | | | Merge branch 'fix/import-hooks' into 'master' Rémy Coutable2017-02-161-0/+4
|\ \ \ \ \ \
| * | | | | | Use gitlab shell import instead of manually creating the webhooksJames Lopez2017-02-161-0/+4
* | | | | | | Merge branch 'paginate-environments-bundle' into 'master' Fatih Acet2017-02-1622-1112/+1326
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fe-paginated-environments-api' into 'paginate-environments-bund...paginate-environments-bundleFilipa Lacerda2017-02-1622-1112/+1326
| |\ \ \ \ \ \ \
| | * | | | | | | Remove arrow icon from foldersFilipa Lacerda2017-02-161-1/+0
| | * | | | | | | Create util to handle pagination transformationFilipa Lacerda2017-02-163-18/+17
| | * | | | | | | Changes after reviewFilipa Lacerda2017-02-163-13/+14
| | * | | | | | | Merge branch 'fe-paginated-environments-api-add-pagination' into fe-paginated...Filipa Lacerda2017-02-163-4/+12
| | |\ \ \ \ \ \ \
| | | * | | | | | | Changes after reviewfe-paginated-environments-api-add-paginationFilipa Lacerda2017-02-161-2/+10
| | | * | | | | | | Rename storePagination to setPaginationFilipa Lacerda2017-02-162-2/+2
| | * | | | | | | | Fix broken testsfe-paginated-environments-api-add-subviewFilipa Lacerda2017-02-161-2/+2
| | * | | | | | | | 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-156-72/+79
| | * | | | | | | | 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-154-0/+267
| | * | | | | | | | 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-122-27/+20
| | * | | | | | | | Remove spec checking for scope 'all' since it's no longer part of componentFilipa Lacerda2017-02-121-2/+4
| | * | | | | | | | Integrates pagination component with APIFilipa Lacerda2017-02-125-23/+47
| | * | | | | | | | Verify `latest` key is present when neededFilipa Lacerda2017-02-121-0/+12
| | * | | | | | | | Adds pagination componentFilipa Lacerda2017-02-122-2/+36
| | |/ / / / / / /
| | * | | | | | | Fix typoFilipa Lacerda2017-02-121-12/+12
| | * | | | | | | Fix broken pathFilipa Lacerda2017-02-121-25/+83
| | * | | | | | | Merge branch 'master' into fe-paginated-environments-apiFilipa Lacerda2017-02-1287-356/+428
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix pagination headers in grouped environments APIGrzegorz Bizon2017-02-101-9/+14
| | * | | | | | | | Fix broken test and linter errorFilipa Lacerda2017-02-091-1/+1