summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Delete artifacts for pages unless expiry date is specifieddelete-pagesKamil Trzcinski2017-03-054-0/+29
|
* Merge branch 'pages-for-ee' into 'master' Kamil Trzciński2017-03-051-0/+1
|\ | | | | | | | | Re-enable GitLab pages job for GitLab EE See merge request !9703
| * Re-enable GitLab pages job for GitLab EEpages-for-ee💃 Winnie 💃2017-03-041-0/+1
| |
* | Merge branch 'format-timeago-date' into 'master' Jacob Schatz2017-03-054-5/+9
|\ \ | | | | | | | | | | | | | | | | | | Formats timeago dates to be more friendly Closes #27537 See merge request !9145
| * | Fixed timeago specsformat-timeago-datePhil Hughes2017-02-132-4/+4
| | |
| * | Formats timeago dates to be more friendlyPhil Hughes2017-02-102-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Formats the timeago timestamps to be a short date. This will only be visible on slower connections whilst the JS is loading, after the JS has loaded it will be turned into a timeago string Closes #27537
* | | Merge branch 'commons-chunk-plugin' into 'master' Jacob Schatz2017-03-0533-71/+135
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Use CommonsChunkPlugin to place vendor libraries in cacheable bundles Closes #25550 See merge request !9647
| * | merge cropper library into profile_bundlecommons-chunk-pluginMike Greiling2017-03-034-9/+2
| | |
| * | remove isolated common_vue inclusionMike Greiling2017-03-031-2/+0
| | |
| * | rename application entry point and change manifest to runtimeMike Greiling2017-03-033-5/+5
| | |
| * | remove problematic plugins from karma's webpack configMike Greiling2017-03-031-1/+12
| | |
| * | add CHANGELOG.md entry for !9647Mike Greiling2017-03-031-0/+5
| | |
| * | create a cacheable commons bundle for d3 libraryMike Greiling2017-03-037-6/+13
| | |
| * | merge lib_chart into graphs bundleMike Greiling2017-03-036-7/+2
| | |
| * | include vue_shared scripts within common_vue chunkMike Greiling2017-03-031-1/+3
| | |
| * | create a cacheable commons bundle for our Vue bundlesMike Greiling2017-03-0312-5/+28
| | |
| * | don't rely on global spaced Vue library for issuable bundleMike Greiling2017-03-031-0/+2
| | |
| * | separate webpack runtime into its own chunk to maintain cacheability of ↵Mike Greiling2017-03-032-3/+3
| | | | | | | | | | | | common chunk
| * | refactor common bundle to ES module syntax and move global exports to ↵Mike Greiling2017-03-035-32/+49
| | | | | | | | | | | | application.js
| * | create a common.js bundle and include all jQuery pluginsMike Greiling2017-03-037-30/+34
| | |
| * | update plugin formattingMike Greiling2017-03-031-0/+3
| | |
| * | use deterministic module IDs in production and developmentMike Greiling2017-03-031-0/+4
| | |
* | | Merge branch 'dashboard-filter-search-keep-params' into 'master' Dmitriy Zaporozhets2017-03-0427-205/+244
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixes filtering by name reseting archive filter Closes #28007 See merge request !9625
| * | | Improve explore projects spinach testDmitriy Zaporozhets2017-03-041-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project name "Internal" is too generic and can lead to false positive/negative when there is a visibility filter on the page. So we ensure we check for project inside list holder css class. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Improve projects/groups list js codedashboard-filter-search-keep-paramsDmitriy Zaporozhets2017-03-043-10/+14
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Removed empty options from URLPhil Hughes2017-03-031-1/+1
| | | |
| * | | Refactor projects filtering by nameDmitriy Zaporozhets2017-03-0323-207/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse same search form and behavior for dashboard#projects, group#projects and admin#projects. Repsect all other options like sorting, personal filter when search projects by name. Create FilterableList JS class to handle identical behaviour of projects and groups lists. This change also makes filtering and sorting availabe on explore#projects and explore#groups no matter if you are logged in or not. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Fixed filter_projects param still used in group controllerPhil Hughes2017-03-031-1/+1
| | | |
| * | | Fixed incorrect empty state showingPhil Hughes2017-03-031-2/+2
| | | |
| * | | Fixes filtering by name reseting archive filterPhil Hughes2017-03-038-22/+48
| | | | | | | | | | | | | | | | | | | | | | | | Previously the search form just wasn't including any params that had previously been set, so when you filtered by name, it would reset all the params & therefore ignoring the archived param Closes #28007
* | | | Merge branch 'dz-change-project-view' into 'master' Dmitriy Zaporozhets2017-03-043-2/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Change default project view for user from readme to files view See merge request !9584
| * | | | Change default project view for user from readme to files viewdz-change-project-viewDmitriy Zaporozhets2017-03-033-2/+7
| |/ / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'list_issues_with_no_labels' into 'master' Hannes Rosenögger2017-03-042-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Be able to list issues with no labels using API Closes #28520 See merge request !9697
| * | | | Adds changelog entryVignesh Ravichandran2017-03-041-0/+4
| | | | |
| * | | | Be able to list issues with no labels using APIVignesh Ravichandran2017-03-031-0/+6
|/ / / /
* | | | Merge branch 'sh-improve-sidekiq-status' into 'master' Robert Speicher2017-03-042-6/+55
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Make SidekiqStatus able to count number of jobs completed/running See merge request !9694
| * | | | Make SidekiqStatus able to count number of jobs completed/runningsh-improve-sidekiq-statusStan Hu2017-03-032-6/+55
| | |/ / | |/| |
* | | | Merge branch 'bump-health-check-gem' into 'master' Robert Speicher2017-03-044-6/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Bump health_check gem to version 2.6.0 See merge request !9691
| * | | Bump health_check gem to version 2.6.0bump-health-check-gemDouglas Barbosa Alexandre2017-03-034-6/+6
| | | |
* | | | Merge branch 'revert-320ef318' into 'master' Filipa Lacerda2017-03-032-8/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'tooltip-hide-on-scroll' into 'master'" See merge request !9693
| * | | | Revert "Merge branch 'tooltip-hide-on-scroll' into 'master'"revert-320ef318Phil Hughes2017-03-032-8/+0
| |/ / / | | | | | | | | This reverts merge request !9653
* | | | Merge branch 'patch-16' into 'master' Achilleas Pipinellis2017-03-031-3/+53
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add Microsoft Exchange reply by email details Closes #28131 See merge request !9482
| * | | | add Microsoft Exchange reply by email details Ben Bodenmiller2017-02-231-3/+53
| | | | | | | | | | | | | | | | | | | | | | | | | fix #28131 [skip ci]
* | | | | Merge branch '26847-api-pipelines-use-basic' into 'master' Robert Speicher2017-03-038-40/+250
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Expose pipelines as PipelineBasic `api/v4/projects/:id/pipelines` Closes #26847 See merge request !8875
| * | | | Expose pipelines as PipelineBasic `projects/:id/pipelines`26847-api-pipelines-use-basicToon Claes2017-03-038-40/+250
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The `projects/:id/pipelines` exposed a lot of extra details that are superfluous and it was taking extra resources to fetch them. To get more details about a pipeline, use `projects/:id/pipelines/:pipeline_id`.
* | | | Merge branch 'set-kube-ca-pem-to-file' into 'master' Kamil Trzciński2017-03-034-2/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add KUBE_CA_PEM_FILE, deprecate KUBE_CA_PEM Closes #25753 See merge request !9398
| * | | | Add KUBE_CA_PEM_FILE, deprecate KUBE_CA_PEMNick Thomas2017-03-034-2/+18
|/ / / /
* | | | Merge branch 'dm-fix-cherry-pick' into 'master' Robert Speicher2017-03-0313-119/+111
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cherry-picking or reverting through an MR Closes #28711 and #28426 See merge request !9640
| * | | | Remove useless assignmentdm-fix-cherry-pickDouwe Maan2017-03-031-1/+1
| | | | |
| * | | | Use separate error class for cherry-pick and revert tree errorsDouwe Maan2017-03-022-11/+8
| | | | |