summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Issues API: Add None/Any option to assignee_idHeinrich Lee Yu2018-10-262-16/+28
|
* Merge branch '40372-prometheus-dashboard-broken-on-firefox' into 'master'Clement Ho2018-10-251-2/+3
|\ | | | | | | | | | | | | Resolve "Prometheus dashboard broken on Firefox" Closes #40372 See merge request gitlab-org/gitlab-ce!22400
| * Fix prometheus graphs in firefox40372-prometheus-dashboard-broken-on-firefoxAdriel Santiago2018-10-241-2/+3
| |
* | Merge branch 'winh-countdown-component' into 'master'Clement Ho2018-10-252-0/+61
|\ \ | | | | | | | | | | | | Add reusable component for counting down See merge request gitlab-org/gitlab-ce!22499
| * | Add validation for date strings passed to GlCountdownwinh-countdown-componentWinnie Hellmann2018-10-251-4/+7
| | |
| * | Add reusable component for counting downWinnie Hellmann2018-10-251-0/+46
| | |
| * | Add calculateRemainingMilliseconds() helper functionWinnie Hellmann2018-10-251-0/+12
| | |
* | | Merge branch 'jramsay-42673-commit-tooltip' into 'master'Douwe Maan2018-10-251-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add title to commit links in list view Closes #42673 See merge request gitlab-org/gitlab-ce!22585
| * | | Add title to commit links in list viewJames Ramsay2018-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The short commit message may be truncated making the truncated portion unreadable. The title of the link should be the commit message so that the commit message is shown when hovering the commit message anchor. Closes gitlab-org/gitlab-ce#42673
* | | | Merge branch 'prettify-all-the-things-3' into 'master'Tim Zallmann2018-10-2546-780/+1001
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Prettify all the things (part 3) See merge request gitlab-org/gitlab-ce!22251
| * | | | Prettify app/assets/javascripts/pagesprettify-all-the-things-3Mike Greiling2018-10-1746-780/+1001
| | | | |
* | | | | Merge branch '49565-ssh-push-mirroring' into 'master'Robert Speicher2018-10-252-0/+146
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Backport SSH host key detection code to CE See merge request gitlab-org/gitlab-ce!22577
| * | | | Backport SSH host key detection code to CENick Thomas2018-10-252-0/+146
| | | | | | | | | | | | | | | | | | | | | | | | | This functionality is needed for SSH push mirroring support, which is a CE feature.
* | | | | Merge branch '53055-combine-date-util-functions' into 'master'Filipa Lacerda2018-10-259-218/+214
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Combine all datetime library functions into `datetime_utility.js` This MR moves datetime methods from `app/assets/javascripts/lib/utils/pretty_time.js` & `app/assets/javascripts/lib/utils/datefix.js` into `app/assets/javascripts/lib/utils/datetime_utility.js`. Closes #53055 See merge request gitlab-org/gitlab-ce!22570
| * | | | | Run through Prettier and remove ESLint disablesKushal Pandya2018-10-253-150/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Formats the file to match Prettier rules Removes all blacklisted ESLint rules
| * | | | | Update pretty_time methods import pathKushal Pandya2018-10-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates path for pretty time related methods to import from `datetime_utility.js`
| * | | | | Add pretty_time methodsKushal Pandya2018-10-252-63/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds methods from `app/assets/javascripts/lib/utils/pretty_time.js` and deletes the file
| * | | | | Update pikaday method import pathKushal Pandya2018-10-254-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates path for pikaday parsing methods to import from `datetime_utility.js`
| * | | | | Add pikaday parsing methodsKushal Pandya2018-10-252-28/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds methods from `app/assets/javascripts/lib/utils/datefix.js` and deletes the files
| * | | | | Convert methods to ES6 exportsKushal Pandya2018-10-251-39/+36
| | |_|_|/ | |/| | |
* | | | | Merge branch 'mr-diff-data' into 'master'Filipa Lacerda2018-10-256-78/+78
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Impove diff discussion data See merge request gitlab-org/gitlab-ce!22491
| * | | | | Update the state, not a paramPhil Hughes2018-10-253-56/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed a bug where discussions wouldn't be assigned to a line when switching from discussion tab to changes tab
| * | | | | Impove diff discussion datamr-diff-dataPhil Hughes2018-10-246-76/+75
| | | | | | | | | | | | | | | | | | | | | | | | Pre-request to https://gitlab.com/gitlab-org/gitlab-ce/issues/48956
* | | | | | Merge branch 'refactor_gitlab_kube_client' into 'master'Kamil Trzciński2018-10-253-13/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Gitlab::KubeClient Closes #52131 See merge request gitlab-org/gitlab-ce!22073
| * | | | | | Store version within SUPPORTED_API_GROUPS hashrefactor_gitlab_kube_clientThong Kuah2018-10-233-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the ability to pass in a different version. We can instead create a new entry in the SUPPORTED_API_GROUPS hash for a different version if need be.
| * | | | | | Update all usages of KubeClientThong Kuah2018-10-233-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Find and replace everywhere we pass in `api_groups` to KubeClient, as no longer needed
* | | | | | | Move job stuck status to backendSteve Azzopardi2018-10-254-20/+14
| |_|/ / / / |/| | | | |
* | | | | | Prettify all the things (part 7)Mike Greiling2018-10-2448-679/+826
| |_|_|_|/ |/| | | |
* | | | | Fix usage ping linkAnand2018-10-241-1/+1
| | | | |
* | | | | Merge branch 'backport-ce-for-5781-operations-homepage-mvc-frontend' into ↵Annabel Dunstone Gray2018-10-241-0/+10
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 'master' Backport scss changes for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7973 See merge request gitlab-org/gitlab-ce!22503
| * | | | Backport scss changes for ee 7973backport-ce-for-5781-operations-homepage-mvc-frontendAdriel Santiago2018-10-191-0/+10
| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7973
* | | | | Merge branch 'fix/limit-flash-notice-width' into 'master'Phil Hughes2018-10-243-7/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit flash notice width for fixed layout and improve spacing for fluid layout Closes #32868 See merge request gitlab-org/gitlab-ce!16482
| * | | | | Limit flash notice width on fixed and fluid layoutGeorge Tsiolis2018-10-233-7/+8
| | | | | |
* | | | | | Add transparent background to markdown header tabsGeorge Tsiolis2018-10-241-0/+1
| |_|_|/ / |/| | | |
* | | | | Merge branch 'mr-file-list' into 'master'Filipa Lacerda2018-10-243-24/+140
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add list mode to file browser in diffs Closes #51859 See merge request gitlab-org/gitlab-ce!22191
| * | | | | Use convertPermissionToBoolean to get a booleanmr-file-listPhil Hughes2018-10-232-2/+7
| | | | | |
| * | | | | Changed list view tooltipPhil Hughes2018-10-231-2/+2
| | | | | |
| * | | | | Updated file tree iconPhil Hughes2018-10-231-2/+2
| | | | | |
| * | | | | Store tree list preference in localStoragePhil Hughes2018-10-231-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | Fixed clear search button not clearing
| * | | | | Dynamically truncate the text in the file rowPhil Hughes2018-10-233-15/+27
| | | | | |
| * | | | | Add list mode to file browser in diffsPhil Hughes2018-10-234-24/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds toggle buttons to switch between file & tree list. For file list, it renders the truncated paths with the ellipsis at the start of the path. When focusing the input, it hides the toggle buttons. On blur, the buttons get shown again. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51859
* | | | | | Merge branch 'add-security-dashboard-link-ce' into 'master'Kamil Trzciński2018-10-242-1/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync group sidebar template with EE See merge request gitlab-org/gitlab-ce!22549
| * | | | | | Sync group sidebar template with EEadd-security-dashboard-link-cesamdbeckham2018-10-232-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Allow to extend nav links for the Group sidebar
* | | | | | | Resolve "Endless scroll loader is visible on user profile overview page"Martin Wortschack2018-10-243-7/+16
|/ / / / / /
* | | | | | Merge branch '53013-duplicate-escape' into 'master'Phil Hughes2018-10-231-6/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes duplicate escape from job item Closes #53013 See merge request gitlab-org/gitlab-ce!22536
| * | | | | Removes escape from job item53013-duplicate-escapeFilipa Lacerda2018-10-231-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tooltips aren't using v-html anymore thus causing escape not to be needed
* | | | | | Update Runner Chart to 0.1.35Tomasz Maczukin2018-10-231-1/+1
| | | | | |
* | | | | | Merge branch 'support-license-management-and-performance' into 'master'Grzegorz Bizon2018-10-231-3/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support licenses and performance See merge request gitlab-org/gitlab-ce!22175
| * | | | | | Support licenses and performancesupport-license-management-and-performanceKamil Trzciński2018-10-221-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a new syntax for all licenses and performance jobs: ```yaml job: reports: performance: performance.json license_management: gl-license-management-report.json ```
* | | | | | | Update Todo icons in collapsed sidebar for Issues and MRsKushal Pandya2018-10-232-4/+4
| | | | | | |
View Lorry Controller Status