Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use less strict caret ranges now that yarn.lock will take care of locking our...fix-node-dev-deps | Mike Greiling | 2017-02-16 | 2 | -18/+18 |
* | move webpack-dev-server and karma-mocha-reporter to devDependencies | Mike Greiling | 2017-02-16 | 1 | -4/+4 |
* | Merge branch 'docs/pages-admin' into 'master' | Achilleas Pipinellis | 2017-02-16 | 2 | -156/+248 |
|\ | |||||
| * | Simplify Pages admin source docsdocs/pages-admin | Achilleas Pipinellis | 2017-02-16 | 1 | -91/+160 |
| * | Simplify Pages admin Omnibus docs | Achilleas Pipinellis | 2017-02-16 | 1 | -65/+88 |
* | | Merge branch 'active_when' into 'master' | Robert Speicher | 2017-02-16 | 17 | -55/+66 |
|\ \ | |||||
| * | | Add active_when helper | Semyon Pupkov | 2017-02-15 | 17 | -55/+66 |
* | | | Merge branch 'seed-abuse-reports' into 'master' | Stan Hu | 2017-02-16 | 2 | -0/+9 |
|\ \ \ | |||||
| * | | | Seed abuse reportsseed-abuse-reports | Eric Eastwood | 2017-02-15 | 2 | -0/+9 |
| |/ / | |||||
* | | | Merge branch '28262-horizontal-scrolling-issue-on-long-project-names' into 'm... | Annabel Dunstone Gray | 2017-02-16 | 2 | -0/+5 |
|\ \ \ | |||||
| * | | | Wrap long Project and Group titles28262-horizontal-scrolling-issue-on-long-project-names | Sam Rose | 2017-02-16 | 2 | -0/+5 |
* | | | | Merge branch 'instrument-in-karma' into 'master' | Alfredo Sumaran | 2017-02-16 | 3 | -1/+15 |
|\ \ \ \ | |||||
| * | | | | Move babel config for instanbul to karma config (!9286) | winniehell | 2017-02-16 | 3 | -1/+15 |
* | | | | | Merge branch '28247-timeloops-bug' into 'master' | Clement Ho | 2017-02-16 | 6 | -52/+39 |
|\ \ \ \ \ | |||||
| * | | | | | Fix broken test28247-timeloops-bug | Filipa Lacerda | 2017-02-16 | 1 | -2/+2 |
| * | | | | | Transforms startTimeAgoLoops into a static method so we can reuse it instead ... | Filipa Lacerda | 2017-02-16 | 3 | -9/+5 |
| * | | | | | Only run timeago loops after rendering timeago components | Filipa Lacerda | 2017-02-16 | 5 | -43/+34 |
* | | | | | | Merge branch '28253-fix-buid-scroll-button-position' into 'master' | Annabel Dunstone Gray | 2017-02-16 | 2 | -1/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add CHANGELOG file | Alfredo Sumaran | 2017-02-16 | 1 | -0/+4 |
| * | | | | | | Fix positioning of top scroll button | Alfredo Sumaran | 2017-02-16 | 1 | -1/+1 |
* | | | | | | | Merge branch '27281-devicon' into 'master' | Robert Speicher | 2017-02-16 | 4 | -1/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | dev favicon is blue, not purple27281-devicon | Simon Knox | 2017-02-16 | 3 | -3/+3 |
| * | | | | | | | override favicon for development to find tabs more easily | Simon Knox | 2017-02-16 | 4 | -1/+17 |
* | | | | | | | | Merge branch 'sh-namespace-cleanup-deleted-projects' into 'master' | Douwe Maan | 2017-02-16 | 4 | -6/+31 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix a number of race conditions that can occur during namespace deletionsh-namespace-cleanup-deleted-projects | Stan Hu | 2017-02-15 | 4 | -6/+31 |
* | | | | | | | | | Merge branch '26957-tanuki-anim-hang' into 'master' | Clement Ho | 2017-02-16 | 6 | -6/+26 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | don't trigger tanuki loader when downloading files26957-tanuki-anim-hang | Simon Knox | 2017-02-16 | 6 | -6/+26 |
* | | | | | | | | | Merge branch '27986-text-spacing' into 'master' | Filipa Lacerda | 2017-02-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | add space between ci text and commit sha in Merge Request widget27986-text-spacing | Simon Knox | 2017-02-17 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'fix/import-hooks' into 'master' | Rémy Coutable | 2017-02-16 | 5 | -32/+49 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fix tmpdirfix/import-hooks | James Lopez | 2017-02-16 | 1 | -1/+1 |
| * | | | | | | | | | | Use gitlab shell import instead of manually creating the webhooks | James Lopez | 2017-02-16 | 5 | -32/+49 |
* | | | | | | | | | | | Merge branch 'paginate-environments-bundle' into 'master' | Fatih Acet | 2017-02-16 | 41 | -1378/+1884 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'fe-paginated-environments-api' into 'paginate-environments-bund...paginate-environments-bundle | Filipa Lacerda | 2017-02-16 | 41 | -1378/+1884 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'fe-paginated-environments-api-add-pagination' into 'fe-paginate... | Filipa Lacerda | 2017-02-16 | 23 | -255/+1006 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'fe-paginated-environments-api-add-subview' into 'fe-paginated-e... | Filipa Lacerda | 2017-02-16 | 19 | -257/+851 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | Remove arrow icon from folders | Filipa Lacerda | 2017-02-16 | 1 | -1/+0 |
| | | | * | | | | | | | | | | | Create util to handle pagination transformation | Filipa Lacerda | 2017-02-16 | 4 | -18/+41 |
| | | | * | | | | | | | | | | | Changes after review | Filipa Lacerda | 2017-02-16 | 3 | -13/+14 |
| | | | * | | | | | | | | | | | Merge branch 'fe-paginated-environments-api-add-pagination' into fe-paginated... | Filipa Lacerda | 2017-02-16 | 4 | -5/+13 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Changes after reviewfe-paginated-environments-api-add-pagination | Filipa Lacerda | 2017-02-16 | 1 | -2/+10 |
| | | * | | | | | | | | | | | | Rename storePagination to setPagination | Filipa Lacerda | 2017-02-16 | 3 | -3/+3 |
| | | | * | | | | | | | | | | | Fix broken testsfe-paginated-environments-api-add-subview | Filipa Lacerda | 2017-02-16 | 5 | -77/+98 |
| | | | * | | | | | | | | | | | Adds Changelog entry | Filipa Lacerda | 2017-02-15 | 1 | -0/+4 |
| | | | * | | | | | | | | | | | Moves check for latest key to store instead of poluting the view making it re... | Filipa Lacerda | 2017-02-15 | 3 | -100/+112 |
| | | | * | | | | | | | | | | | Move change page param to utility function | Filipa Lacerda | 2017-02-15 | 9 | -72/+328 |
| | | | * | | | | | | | | | | | Use common util to get parameter name | Filipa Lacerda | 2017-02-15 | 2 | -22/+9 |
| | | | * | | | | | | | | | | | Fix underline style | Filipa Lacerda | 2017-02-15 | 1 | -0/+1 |
| | | | * | | | | | | | | | | | Adds url for folder; | Filipa Lacerda | 2017-02-15 | 5 | -96/+59 |
| | | | * | | | | | | | | | | | First iteration | Filipa Lacerda | 2017-02-15 | 5 | -0/+268 |