Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | Merge branch 'fe-paginated-environments-api' into ↵ | Filipa Lacerda | 2017-02-15 | 1 | -3/+4 |
|\ | | | | | | | | | | | | | fe-paginated-environments-api-add-pagination * fe-paginated-environments-api: Add count keys to response JSON | ||||
| * | Add count keys to response JSONfe-paginated-environments-api | Z.J. van de Weg | 2017-02-15 | 1 | -3/+4 |
| | | |||||
* | | Add pagination tests for environments table | Filipa Lacerda | 2017-02-12 | 3 | -27/+62 |
| | | | | | | | | | | | | Remove fdescribe statement Fix conflict | ||||
* | | Remove spec checking for scope 'all' since it's no longer part of component | Filipa Lacerda | 2017-02-12 | 3 | -11/+13 |
| | | | | | | | | | | | | Changes after review Fix typo | ||||
* | | Integrates pagination component with API | Filipa Lacerda | 2017-02-12 | 7 | -34/+100 |
| | | | | | | | | | | | | | | | | Adds pagination tests Remove misplaced comment Fix broken store test | ||||
* | | Verify `latest` key is present when needed | Filipa Lacerda | 2017-02-12 | 1 | -0/+12 |
| | | |||||
* | | Adds pagination component | Filipa Lacerda | 2017-02-12 | 2 | -2/+36 |
|/ | |||||
* | Fix typo | Filipa Lacerda | 2017-02-12 | 2 | -13/+13 |
| | |||||
* | Fix broken path | Filipa Lacerda | 2017-02-12 | 1 | -25/+83 |
| | |||||
* | Merge branch 'master' into fe-paginated-environments-api | Filipa Lacerda | 2017-02-12 | 183 | -9908/+1061 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (97 commits) convert js-cookie dependency to an npm module convert timeago.js dependency to an npm module remove vue from vendor since it is now in node_modules Add CHANGELOG file Stylize blockquote in notification emails Add js prefix to right sidebar Replace accidentally deleted metaclick Remove right padding from navbar-collapse on large screens Add changelog common_utils merge conflicts Set sidebar height to 100% if at top of page Set height of fixed sidebars with js Add sticky sidebar on wiki page Fix comment button test for slash commands Fix time tracking spec Fix issue boards sidebar alignment and sidebar toggle spec Fix failing conflicts test Fix build sidebar scrolling Refactor JS Fix pinned sidebar alignment ... | ||||
| * | Merge branch '28029-improve-blockquote-formatting-on-emails' into 'master' | Annabel Dunstone Gray | 2017-02-11 | 2 | -0/+11 |
| |\ | | | | | | | | | | | | | | | | | | | Resolve "Improve blockquote formatting in notification emails" Closes #28029 See merge request !9157 | ||||
| | * | Add CHANGELOG file28029-improve-blockquote-formatting-on-emails | Alfredo Sumaran | 2017-02-10 | 1 | -0/+4 |
| | | | |||||
| | * | Stylize blockquote in notification emails | Alfredo Sumaran | 2017-02-10 | 1 | -0/+7 |
| | | | |||||
| * | | Merge branch 'clean-javascript-vendor-files' into 'master' | Filipa Lacerda | 2017-02-11 | 15 | -9095/+9 |
| |\ \ | | | | | | | | | | | | | | | | | Convert some vendored javascript assets to npm modules See merge request !8990 | ||||
| | * | | convert js-cookie dependency to an npm moduleclean-javascript-vendor-files | Mike Greiling | 2017-02-11 | 5 | -4/+5 |
| | | | | |||||
| | * | | convert timeago.js dependency to an npm module | Mike Greiling | 2017-02-11 | 5 | -240/+4 |
| | | | | |||||
| | * | | remove vue from vendor since it is now in node_modules | Mike Greiling | 2017-02-11 | 6 | -8851/+0 |
| | |/ | |||||
| * | | Merge branch '27994-fix-mr-widget-jump' into 'master' | Filipa Lacerda | 2017-02-10 | 3 | -6/+10 |
| |\ \ | | |/ | |/| | | | | | | | | | | | | | fixes MR widget jump Closes #27994 See merge request !9146 | ||||
| | * | Merge branch 'master' into 27994-fix-mr-widget-jump | Filipa Lacerda | 2017-02-10 | 57 | -189/+402 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (26 commits) Revert "Merge branch 'add-additional-checks-to-ca-data' into 'master' " Fix broken test to use trigger in order to not take tooltip overlaping in consideration Fix job to pipeline renaming Added env external link and light web terminal spec Don't perform Devise trackable updates on blocked User records Replace teaspoon references with Karma Add changelog Only show MR widget graph if there are stages Remove orange caret icon from mr widget Add index to ci_trigger_requests for commit_id rspec_profiling: Discover the correct branch name in GitLab CI Show parent group members for nested group Fix tooltip scss for anchors. Adds css for button's tooltips to have similar behavior. Removes padding from mini graph table cell to guarantee stages don't break line on hover Updated protected branches dropdown image in docs Fix admin_labels_spec.rb transient failure Make sure events have most properties defined Restore exposure of legend property for events moved hyperlink reference section at the end of the content Make sure our current .gitlab-ci.yml is valid adds changelog ... | ||||
| | * | | adds changelog27994-fix-mr-widget-jump | Nur Rony | 2017-02-10 | 1 | -0/+4 |
| | | | | |||||
| | * | | fixes MR widget jump | Nur Rony | 2017-02-10 | 2 | -6/+6 |
| | | | | |||||
| * | | | Merge branch 'static-navbar' into 'master' | Jacob Schatz | 2017-02-10 | 22 | -70/+62 |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | Remove fixed positioning from navbar See merge request !7547 | ||||
| | * | | Add js prefix to right sidebar | Annabel Dunstone Gray | 2017-02-10 | 5 | -5/+8 |
| | | | | |||||
| | * | | Replace accidentally deleted metaclick | Annabel Dunstone Gray | 2017-02-10 | 1 | -0/+8 |
| | | | | |||||
| | * | | Remove right padding from navbar-collapse on large screens | Annabel Dunstone Gray | 2017-02-10 | 1 | -0/+4 |
| | | | | |||||
| | * | | Add changelog | Annabel Dunstone Gray | 2017-02-10 | 1 | -0/+4 |
| | | | | |||||
| | * | | common_utils merge conflicts | Annabel Dunstone Gray | 2017-02-10 | 1 | -3/+1 |
| | | | | |||||
| | * | | Set sidebar height to 100% if at top of page | Annabel Dunstone Gray | 2017-02-10 | 1 | -0/+2 |
| | | | | |||||
| | * | | Set height of fixed sidebars with js | Annabel Dunstone Gray | 2017-02-10 | 2 | -1/+11 |
| | | | | |||||
| | * | | Add sticky sidebar on wiki page | Annabel Dunstone Gray | 2017-02-10 | 2 | -2/+2 |
| | | | | |||||
| | * | | Fix comment button test for slash commands | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix time tracking spec | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix issue boards sidebar alignment and sidebar toggle spec | Annabel Dunstone Gray | 2017-02-10 | 2 | -6/+2 |
| | | | | |||||
| | * | | Fix failing conflicts test | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix build sidebar scrolling | Annabel Dunstone Gray | 2017-02-10 | 1 | -16/+0 |
| | | | | |||||
| | * | | Refactor JS | Annabel Dunstone Gray | 2017-02-10 | 1 | -3/+1 |
| | | | | |||||
| | * | | Fix pinned sidebar alignment | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | Remove navbar height offsets | Annabel Dunstone Gray | 2017-02-10 | 4 | -30/+5 |
| | | | | |||||
| | * | | Keep sidebars absolute until fixed at top; remove unneeded JS | Annabel Dunstone Gray | 2017-02-10 | 8 | -17/+21 |
| | | | | |||||
| | * | | Fix sidebar scrolling | Annabel Dunstone Gray | 2017-02-10 | 2 | -2/+12 |
| | | | | |||||
| | * | | Remove fixed positioning from navbar | Annabel Dunstone Gray | 2017-02-10 | 4 | -7/+3 |
| |/ / | |||||
| * | | Merge branch '27987-skipped-pipeline-mr-graph' into 'master' | Alfredo Sumaran | 2017-02-10 | 2 | -2/+7 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Only show MR widget graph if there are stages Closes #27987 See merge request !9141 | ||||
| | * | | Add changelog27987-skipped-pipeline-mr-graph | Annabel Dunstone Gray | 2017-02-10 | 1 | -0/+4 |
| | | | | |||||
| | * | | Only show MR widget graph if there are stages | Annabel Dunstone Gray | 2017-02-10 | 1 | -2/+3 |
| | | | | |||||
| * | | | Merge branch 'replace-teaspoon-references' into 'master' | Clement Ho | 2017-02-10 | 4 | -22/+15 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace teaspoon references with Karma Closes gitlab-com/gitlab-docs#68 See merge request !9011 | ||||
| | * | | | Replace teaspoon references with Karmareplace-teaspoon-references | Clement Ho | 2017-02-10 | 4 | -22/+15 |
| | | | | | |||||
| * | | | | Merge branch '27783-fix-fe-doc-broken-link' into 'master' | Filipa Lacerda | 2017-02-10 | 2 | -42/+48 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes frontend doc broken link Closes #27783 See merge request !9120 | ||||
| | * \ \ \ | Merge branch 'master' into 27783-fix-fe-doc-broken-link27783-fix-fe-doc-broken-link | Filipa Lacerda | 2017-02-10 | 13 | -20/+57 |
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fix admin_labels_spec.rb transient failure Make sure our current .gitlab-ci.yml is valid Show Pipeline(not Job) in MR desktop notification Remove a transient failure from spec/requests/api/groups_spec.rb Update PROCESS.md Update MergeRequest API state_event option documentation Rename issuable to IssueBase |