summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Reduced sidebar wait timeoutboards-sidebar-spec-refactorPhil Hughes2017-02-171-1/+1
|
* Refactor boards sidebar specPhil Hughes2017-02-171-86/+53
| | | | | | | | - Uses Timecop to fix due date spec - Waits for sidebar to be visible before doing anything - Fixes weird issues where the link would be clicked instead of the card itself Closes #28310
* Merge branch 'dont-compress-development-assets' into 'master' Alfredo Sumaran2017-02-171-4/+4
|\ | | | | | | | | Don't compress development assets and fix deprecation warning in production See merge request !9322
| * remove trailing commadont-compress-development-assetsMike Greiling2017-02-161-1/+1
| |
| * replace deprecated NoErrorsPlugin with NoEmitOnErrorsPluginMike Greiling2017-02-161-1/+1
| |
| * only compress assets in productionMike Greiling2017-02-161-4/+4
| |
* | Merge branch '28248-use-page' into 'master' Robert Speicher2017-02-172-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-pageFilipa Lacerda2017-02-162-7/+6
| | | | | | | | | | | | stub pagination in tests
| * | Merge branch 'master' into 28248-use-pageFilipa Lacerda2017-02-1623-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-pageFilipa Lacerda2017-02-16110-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-pageFilipa Lacerda2017-02-1545-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 URLsFilipa Lacerda2017-02-152-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | Fix rubocop error
* | | | | | Merge branch '28059-add-pagination-to-admin-abuse-reports' into 'master' Alfredo Sumaran2017-02-163-0/+24
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore pagination to admin abuse reports Closes #28059 See merge request !9233
| * | | | | Restore pagination to admin abuse reportsEric Eastwood2017-02-163-0/+24
| | | | | |
* | | | | | Merge branch 'fix-8.17-upgrade-process' into 'master' Alfredo Sumaran2017-02-163-15/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 8.17 upgrade documentation Closes #28021 See merge request !9285
| * | | | | | fix typo in node sectionfix-8.17-upgrade-processMike Greiling2017-02-161-1/+1
| | | | | | |
| * | | | | | move "Install node modules" step before "Migrate DB" within update processMike Greiling2017-02-161-1/+1
| | | | | | |
| * | | | | | update migration docs for 8.17 to include minimum node versionMike Greiling2017-02-163-15/+46
| | | | | | |
* | | | | | | Merge branch 'fix/project-tree-restorer-spec-performance' into 'master' Robert Speicher2017-02-162-95/+122
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up project_tree_restorer_spec Closes #28235 See merge request !9266
| * | | | | | | refactored a couple of thingsfix/project-tree-restorer-spec-performanceJames Lopez2017-02-161-12/+9
| | | | | | | |
| * | | | | | | create lighter version of JSON and reuse initial restore in spec to speed up runJames Lopez2017-02-152-91/+121
| | | | | | | |
* | | | | | | | Merge branch 'add-issues-button-disable' into 'master' Fatih Acet2017-02-162-1/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disables add issue button Closes #27931 See merge request !9100
| * | | | | | | Disables add issue buttonadd-issues-button-disablePhil Hughes2017-02-092-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously was disabled until any list was present (except for done) this now takes into account the welcome blank state Closes #27931
* | | | | | | | Merge branch 'fix-pipelines-pagination-is-gone' into 'master' Alfredo Sumaran2017-02-162-2/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renders pagination again for pipelines table Closes #28299 See merge request !9315
| * | | | | | | | Renders pagination again for pipelines tableFilipa Lacerda2017-02-162-2/+5
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'docs/pages-admin' into 'master' Achilleas Pipinellis2017-02-162-156/+248
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify GitLab Pages admin docs See merge request !9303
| * | | | | | | | Simplify Pages admin source docsdocs/pages-adminAchilleas Pipinellis2017-02-161-91/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Simplify Pages admin Omnibus docsAchilleas Pipinellis2017-02-161-65/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch 'active_when' into 'master' Robert Speicher2017-02-1617-55/+66
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add active_when helper Closes #24036 See merge request !9166
| * | | | | | | | | Add active_when helperSemyon Pupkov2017-02-1517-55/+66
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24036
* | | | | | | | | Merge branch 'seed-abuse-reports' into 'master' Stan Hu2017-02-162-0/+9
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Seed abuse reports See merge request !9234
| * | | | | | | | Seed abuse reportsseed-abuse-reportsEric Eastwood2017-02-152-0/+9
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` rake db:seed_fu FILTER=abuse_reports ``` Thanks to @stanhu, https://gitlab.com/gitlab-org/gitlab-ce/issues/28059#note_23325328
* | | | | | | | Merge branch '28262-horizontal-scrolling-issue-on-long-project-names' into ↵Annabel Dunstone Gray2017-02-162-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Horizontal scrolling issue on long project names" Closes #28262 See merge request !9301
| * | | | | | | | 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 See merge request !9286
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only run timeago loops after rendering timeago components Closes #28247 See merge request !9267
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of have 2 Fix broken test
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix positioning of top scroll button Closes #28253 See merge request !9276
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | override favicon for development to find tabs more easily See merge request !9260
| * | | | | | | | | | | 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 deletion See merge request !9294
| * | | | | | | | | | | Fix a number of race conditions that can occur during namespace deletionsh-namespace-cleanup-deleted-projectsStan Hu2017-02-154-6/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two problems in the current implementation: 1. If a project is marked for deletion via the `pending_delete` flag and then the namespace was quickly deleted, it's possible that the namespace skips over that project and leaves that project in an orphaned state. 2. Before namespace deletion, the namespace attempts to clean up all the relevant storage paths. However, if all projects have been removed synchronously, then the namespace will not be able to clean anything. To prevent this, we should load the paths to be deleted before actually destroying projects. The specs were missing this second case due to a permission issue that caused project removal never to happen.
* | | | | | | | | | | | Merge branch '26957-tanuki-anim-hang' into 'master' Clement Ho2017-02-166-6/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't trigger tanuki loader when downloading files See merge request !9290
| * | | | | | | | | | | don't trigger tanuki loader when downloading files26957-tanuki-anim-hangSimon Knox2017-02-166-6/+26
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |