summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add CHANGELOG.md entry for !876126824-diff-unfold-link-is-still-visible-when-there-are-no-lines-to-unfoldMike Greiling2017-02-161-0/+5
* prevent diff unfolding link from appearing for deleted filesMike Greiling2017-02-162-2/+2
* fix build failuresMike Greiling2017-02-161-1/+3
* only show diff unfolding link if there are more lines to showMike Greiling2017-02-164-7/+10
* Merge branch 'docs/pages-admin' into 'master' Achilleas Pipinellis2017-02-162-156/+248
|\
| * Simplify Pages admin source docsdocs/pages-adminAchilleas Pipinellis2017-02-161-91/+160
| * Simplify Pages admin Omnibus docsAchilleas Pipinellis2017-02-161-65/+88
* | Merge branch 'active_when' into 'master' Robert Speicher2017-02-1617-55/+66
|\ \
| * | Add active_when helperSemyon Pupkov2017-02-1517-55/+66
* | | Merge branch 'seed-abuse-reports' into 'master' Stan Hu2017-02-162-0/+9
|\ \ \
| * | | Seed abuse reportsseed-abuse-reportsEric Eastwood2017-02-152-0/+9
| |/ /
* | | Merge branch '28262-horizontal-scrolling-issue-on-long-project-names' into 'm...Annabel Dunstone Gray2017-02-162-0/+5
|\ \ \
| * | | Wrap long Project and Group titles28262-horizontal-scrolling-issue-on-long-project-namesSam Rose2017-02-162-0/+5
* | | | Merge branch 'instrument-in-karma' into 'master' Alfredo Sumaran2017-02-163-1/+15
|\ \ \ \
| * | | | Move babel config for instanbul to karma config (!9286)winniehell2017-02-163-1/+15
* | | | | Merge branch '28247-timeloops-bug' into 'master' Clement Ho2017-02-166-52/+39
|\ \ \ \ \
| * | | | | Fix broken test28247-timeloops-bugFilipa Lacerda2017-02-161-2/+2
| * | | | | 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-165-43/+34
* | | | | | Merge branch '28253-fix-buid-scroll-button-position' into 'master' Annabel Dunstone Gray2017-02-162-1/+5
|\ \ \ \ \ \
| * | | | | | Add CHANGELOG fileAlfredo Sumaran2017-02-161-0/+4
| * | | | | | Fix positioning of top scroll buttonAlfredo Sumaran2017-02-161-1/+1
* | | | | | | Merge branch '27281-devicon' into 'master'Robert Speicher2017-02-164-1/+17
|\ \ \ \ \ \ \
| * | | | | | | dev favicon is blue, not purple27281-deviconSimon Knox2017-02-163-3/+3
| * | | | | | | override favicon for development to find tabs more easilySimon Knox2017-02-164-1/+17
* | | | | | | | Merge branch 'sh-namespace-cleanup-deleted-projects' into 'master' Douwe Maan2017-02-164-6/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix a number of race conditions that can occur during namespace deletionsh-namespace-cleanup-deleted-projectsStan Hu2017-02-154-6/+31
* | | | | | | | | Merge branch '26957-tanuki-anim-hang' into 'master' Clement Ho2017-02-166-6/+26
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | don't trigger tanuki loader when downloading files26957-tanuki-anim-hangSimon Knox2017-02-166-6/+26
* | | | | | | | | 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-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
View Lorry Controller Status