Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix merge service error with no sourcefix-merge-service-with-no-source | Sean McGivern | 2017-02-17 | 1 | -1/+1 |
| | | | | | This shouldn't be possible in CE, but is needed so that the code is the same in CE and EE. | ||||
* | Merge branch '28329-allow-slash-in-slash-command-args' into 'master' | Sean McGivern | 2017-02-17 | 3 | -1/+13 |
|\ | | | | | | | | | | | | | Allow slashes in slash command arguments Closes #28329 See merge request !9327 | ||||
| * | Allow slashes in slash command arguments | Rémy Coutable | 2017-02-17 | 3 | -1/+13 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'only-yield-valid-reference-matches' into 'master' | Sean McGivern | 2017-02-17 | 3 | -2/+33 |
|\ \ | | | | | | | | | | | | | | | | | | | Only yield valid references in ReferenceFilter.references_in Closes #27648 See merge request !9318 | ||||
| * | | Only yield valid references in ReferenceFilter.references_inonly-yield-valid-reference-matches | Douwe Maan | 2017-02-16 | 3 | -2/+33 |
| | | | |||||
* | | | Merge branch '26200-convert-sidebar-to-dropdown' into 'master' | Sean McGivern | 2017-02-17 | 51 | -1053/+146 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update global sidebar to dropdown" Closes #26200 See merge request !9199 | ||||
| * | | | Cache js selectors; fix css26200-convert-sidebar-to-dropdown | Annabel Dunstone Gray | 2017-02-16 | 3 | -12/+16 |
| | | | | |||||
| * | | | Remove comments in migration | Annabel Dunstone Gray | 2017-02-16 | 2 | -21/+1 |
| | | | | |||||
| * | | | Move necessary sidebar code to right_sidebar.js; delete sidebar.js | Annabel Dunstone Gray | 2017-02-15 | 3 | -22/+12 |
| | | | | |||||
| * | | | Fix borked db stuff | Annabel Dunstone Gray | 2017-02-15 | 2 | -2/+2 |
| | | | | |||||
| * | | | Change iteration strategy to make PhantomJS happy | Alfredo Sumaran | 2017-02-15 | 1 | -2/+4 |
| | | | | |||||
| * | | | Delete labels spinach test bc covered by rspec | Annabel Dunstone Gray | 2017-02-15 | 2 | -47/+0 |
| | | | | |||||
| * | | | Delete sidebar specs and fixtures; update shortcuts_spec to check page title | Annabel Dunstone Gray | 2017-02-15 | 4 | -174/+5 |
| | | | | |||||
| * | | | Move migration to post_migrate; fix shortcuts_spec | Annabel Dunstone Gray | 2017-02-15 | 2 | -2/+3 |
| | | | | |||||
| * | | | Fix active_tab and issuables_counter specs | Annabel Dunstone Gray | 2017-02-15 | 2 | -4/+6 |
| | | | | |||||
| * | | | Make active links bold; fix badge styling | Annabel Dunstone Gray | 2017-02-15 | 2 | -18/+33 |
| | | | | |||||
| * | | | Remove all instances of theme_id; require downtime | Annabel Dunstone Gray | 2017-02-15 | 13 | -31/+18 |
| | | | | |||||
| * | | | Drop theme ID from users table | Annabel Dunstone Gray | 2017-02-15 | 7 | -16/+32 |
| | | | | |||||
| * | | | Fix dropdown alignment | Annabel Dunstone Gray | 2017-02-15 | 1 | -6/+5 |
| | | | | |||||
| * | | | Remove sidebar toggle button; replace with dropdown | Annabel Dunstone Gray | 2017-02-15 | 2 | -16/+14 |
| | | | | |||||
| * | | | Remove global sidebar styles | Annabel Dunstone Gray | 2017-02-15 | 6 | -121/+10 |
| | | | | |||||
| * | | | Remove all gitlab theme related code | Annabel Dunstone Gray | 2017-02-15 | 17 | -465/+3 |
| | | | | |||||
| * | | | Remove all unnecessary sidebar.js | Annabel Dunstone Gray | 2017-02-15 | 1 | -91/+0 |
| | | | | |||||
| * | | | Remove pinned nav functionality and side_navbar_class | Annabel Dunstone Gray | 2017-02-15 | 2 | -32/+1 |
| | | | | |||||
| * | | | Add dropdown toggle button | Annabel Dunstone Gray | 2017-02-15 | 2 | -39/+49 |
| | | | | |||||
* | | | | Merge branch ↵ | Filipa Lacerda | 2017-02-17 | 5 | -9/+19 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '26824-diff-unfold-link-is-still-visible-when-there-are-no-lines-to-unfold' into 'master' Resolve "Diff unfold link is still visible when there are no lines to unfold" Closes #26824 and #28127 See merge request !8761 | ||||
| * | | | | add CHANGELOG.md entry for !876126824-diff-unfold-link-is-still-visible-when-there-are-no-lines-to-unfold | Mike Greiling | 2017-02-16 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | prevent diff unfolding link from appearing for deleted files | Mike Greiling | 2017-02-16 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | fix build failures | Mike Greiling | 2017-02-16 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | only show diff unfolding link if there are more lines to show | Mike Greiling | 2017-02-16 | 4 | -7/+10 |
| | | | | | |||||
* | | | | | Merge branch ↵ | Filipa Lacerda | 2017-02-17 | 3 | -0/+21 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '27883-autocomplete-seems-to-not-trigger-when-at-character-is-part-of-an-autocompleted-text' into 'master' Trigger at.js after selecting slash commands with autocomplete suffix Closes #27883 See merge request !9117 | ||||
| * | | | | | Retrigger at.js for slash commands with autocomplete suffix27883-autocomplete-seems-to-not-trigger-when-at-character-is-part-of-an-autocompleted-text | Sam Rose | 2017-02-13 | 3 | -0/+21 |
| | | | | | | |||||
* | | | | | | Merge branch 'zj-fix-url-new-issue-presenter' into 'master' | Kamil Trzciński | 2017-02-17 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | Fix project link on issue creation See merge request !9226 | ||||
| * | | | | | Fix project link on issue creationzj-fix-url-new-issue-presenter | Z.J. van de Weg | 2017-02-14 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'dont-compress-development-assets' into 'master' | Alfredo Sumaran | 2017-02-17 | 1 | -4/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't compress development assets and fix deprecation warning in production See merge request !9322 | ||||
| * | | | | | | remove trailing commadont-compress-development-assets | Mike Greiling | 2017-02-16 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | replace deprecated NoErrorsPlugin with NoEmitOnErrorsPlugin | Mike Greiling | 2017-02-16 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | only compress assets in production | Mike Greiling | 2017-02-16 | 1 | -4/+4 |
| | | | | | | | |||||
* | | | | | | | Merge branch '28248-use-page' into 'master' | Robert Speicher | 2017-02-17 | 2 | -3/+23 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `page` query parameter instead of `p` to keep consistency with all URLs Closes #28248 See merge request !9268 | ||||
| * | | | | | | | Reduce number of pipelines created to test pagination28248-use-page | Filipa Lacerda | 2017-02-16 | 2 | -7/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stub pagination in tests | ||||
| * | | | | | | | Merge branch 'master' into 28248-use-page | Filipa Lacerda | 2017-02-16 | 23 | -214/+329 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Renders pagination again for pipelines table Simplify Pages admin source docs Simplify Pages admin Omnibus docs Seed abuse reports Add active_when helper | ||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into 28248-use-page | Filipa Lacerda | 2017-02-16 | 110 | -1663/+2351 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (65 commits) Add CHANGELOG file Fix positioning of top scroll button add space between ci text and commit sha in Merge Request widget Do not use single quote in headings as it breaks docs.gitlab.com Fix broken test Update services templates docs Fix error in MR widget after /merge slash command Remove arrow icon from folders Create util to handle pagination transformation Wrap long Project and Group titles Changes after review Changes after review Rename storePagination to setPagination Transforms startTimeAgoLoops into a static method so we can reuse it instead of have 2 Only run timeago loops after rendering timeago components fix tmpdir Fix broken tests Show merge errors in merge request widget Move babel config for instanbul to karma config (!9286) Clarify that stage is needed to stop environments ... | ||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into 28248-use-page | Filipa Lacerda | 2017-02-15 | 45 | -117/+171 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fix most of broken docs links Change wording of MR comment box | ||||
| * | | | | | | | | | Use `page` query parameter instead of `p` to keep consistency with all URLs | Filipa Lacerda | 2017-02-15 | 2 | -2/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rubocop error | ||||
* | | | | | | | | | | Merge branch '28059-add-pagination-to-admin-abuse-reports' into 'master' | Alfredo Sumaran | 2017-02-16 | 3 | -0/+24 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore pagination to admin abuse reports Closes #28059 See merge request !9233 | ||||
| * | | | | | | | | | Restore pagination to admin abuse reports | Eric Eastwood | 2017-02-16 | 3 | -0/+24 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'fix-8.17-upgrade-process' into 'master' | Alfredo Sumaran | 2017-02-16 | 3 | -15/+46 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 8.17 upgrade documentation Closes #28021 See merge request !9285 | ||||
| * | | | | | | | | | | fix typo in node sectionfix-8.17-upgrade-process | Mike Greiling | 2017-02-16 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | move "Install node modules" step before "Migrate DB" within update process | Mike Greiling | 2017-02-16 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | update migration docs for 8.17 to include minimum node version | Mike Greiling | 2017-02-16 | 3 | -15/+46 |
| | | | | | | | | | | |