summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into michel.engelen/gitlab-ce-issue/55953Sean McGivern2019-07-0335-214/+581
|\
| * Merge branch 'sh-improve-redis-peek' into 'master'Sean McGivern2019-07-032-42/+6
| |\ | | | | | | | | | | | | Add Redis call details in Peek performance bar See merge request gitlab-org/gitlab-ce!30191
| | * Add Redis call details in Peek performance barsh-improve-redis-peekStan Hu2019-07-022-42/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Redis timings appear to be increasing in production, this change makes it easier to see what exactly which queries are being called and where. This is done by prepending modules in peek-redis to store the call details. This commit redact values for all SET commands (e.g. HMSET, GETSET, etc.).
| * | Show upcoming status for releasesJason Goodman2019-07-031-4/+4
| | | | | | | | | | | | | | | | | | Add released_at field to releases API Add released_at column to releases table Return releases to the API sorted by released_at
| * | Rebased and squashed commitsNatalia Tepluhina2019-07-0318-127/+392
| | | | | | | | | | | | - all commits squashed to make danger review happy
| * | Replace slugifyWithHyphens with improved slugify functionLuke Ward2019-07-033-6/+13
| | |
| * | Merge branch 'rj-fix-manual-order' into 'master'Kushal Pandya2019-07-031-1/+1
| |\ \ | | | | | | | | | | | | | | | | Don't let logged out user do manual order See merge request gitlab-org/gitlab-ce!30264
| | * | Don't let logged out user do manual orderrj-fix-manual-orderRajat Jain2019-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add a check for logged out user in the manual order so that they don't see an flash message when they try to reorder issues.
| * | | Merge branch 'vue-i18n-js-ide-directory' into 'master'Tim Zallmann2019-07-035-14/+22
| |\ \ \ | | |_|/ | |/| | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/ide directory See merge request gitlab-org/gitlab-ce!29967
| | * | Vue-i18n: app/assets/javascripts/ide directoryvue-i18n-js-ide-directoryEzekiel Kigbo2019-07-015-14/+22
| | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/ide directory
| * | | Fix typo in updateResolvableDiscussionsCounts actionWinnie Hellmann2019-07-022-7/+7
| | |/ | |/|
| * | Registry component now includes error messagesNick Kipling2019-07-024-13/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | Includes changes to the Vue container registry component to support the display of an empty message and error message when invalid characters are found in the group, project or branch name. repositories/index.html.haml has been changed to remove the content and place into Vue component.
* | | replaced `discussion` with `thread` in comment buttonMichel Engelen2019-07-021-4/+4
| | |
* | | prettified noteable_discussion component and updated testsMichel Engelen2019-07-021-3/+1
| | |
* | | replaced string `discussion` wit `thread` in noteable-discussion componentMichel Engelen2019-07-021-6/+6
| | |
* | | replaced string `discussion` wit `thread` in note-form componentMichel Engelen2019-07-021-2/+2
| | |
* | | replaced string `discussion` with string `thread` in mr-widget component stateMichel Engelen2019-07-021-1/+1
| | |
* | | replaced string `discussion` with string `thread` in thread headerMichel Engelen2019-07-021-1/+1
| | |
* | | renamed `discussion` to `thread` in popover from reply form buttonMichel Engelen2019-07-021-1/+1
| | |
* | | changed string `discussion` to `thread` in discussion (thread) counterMichel Engelen2019-07-021-3/+3
| | |
* | | changed string `discussion` to `thread` in reply formMichel Engelen2019-07-021-3/+3
| | |
* | | changed string `discussion` to `thread` in button and description titleMichel Engelen2019-07-021-2/+2
|/ /
* | Allow adding new entries to existing pathDenys Mishunov2019-07-027-4/+29
| | | | | | | | | | | | | | If an entry has been removed from the tree and later, during the same session, a user is trying to add a new item with the same name/path we should allow for that as long as the original entry is marked with `deleted`.
* | Merge branch '63984-rename-in-folder' into 'master'Kushal Pandya2019-07-021-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Hid re-named entries in subfolders Closes #63984 See merge request gitlab-org/gitlab-ce!30242
| * | Hid re-named entries in subfolders63984-rename-in-folderDenys Mishunov2019-07-021-1/+1
| | |
* | | Vue-i18n: app/assets/javascripts/clusters/ directoryEzekiel Kigbo2019-07-023-9/+8
|/ / | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/clusters/ directory
* | Vue-i18n: app/assets/javascripts/environments directoryEzekiel Kigbo2019-07-014-8/+18
| | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/environments directory
* | Merge branch '63590-pipeline-actions-cause-full-refresh' into 'master'Phil Hughes2019-07-013-4/+13
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Pipeline actions cause full refresh" Closes #63590 See merge request gitlab-org/gitlab-ce!30190
| * | Fix pipelines table update after action63590-pipeline-actions-cause-full-refreshshampton2019-06-283-4/+13
| | | | | | | | | | | | | | | | | | | | | The pipelines table was showing the loading icon after the user cancelled or retried a pipeline. This fixes that so the pipeline updates without removing the table from the DOM.
* | | Allow JupyterHub to be uninstalledJoão Cunha2019-07-011-1/+3
| | | | | | | | | | | | | | | | | | - enabled uninstallation - give it a specific uninstall message - ajust specs
* | | Merge branch 'divergence-graph-api-call' into 'master'Filipa Lacerda2019-07-012-19/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fetch branches divergence graph data through API call Closes #46139 See merge request gitlab-org/gitlab-ce!30068
| * | | Fetch branch diverging counts from APIPhil Hughes2019-07-012-19/+45
| | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/46139
* | | | Merge branch 'vue-i18n-js-pipelines-directory' into 'master'Kushal Pandya2019-07-012-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/pipelines directory See merge request gitlab-org/gitlab-ce!30015
| * | | | Vue-i18n: app/assets/javascripts/pipelines directoryvue-i18n-js-pipelines-directoryEzekiel Kigbo2019-07-012-4/+4
| | |_|/ | |/| | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/pipelines directory
* | | | Merge branch 'vue-i18n-js-pages-directory' into 'master'Kushal Pandya2019-07-013-9/+45
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/pages directory See merge request gitlab-org/gitlab-ce!29978
| * | | | Moved feature access arrays to constantsvue-i18n-js-pages-directoryEzekiel Kigbo2019-07-013-7/+41
| | | | |
| * | | | Vue-i18n: app/assets/javascripts/pages directoryEzekiel Kigbo2019-07-012-7/+9
| |/ / / | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/pages directory
* | | | Vue-i18n: app/assets/javascripts/serverless directoryEzekiel Kigbo2019-07-013-19/+47
| | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/serverless directory
* | | | Vue-i18n: various js directoriesEzekiel Kigbo2019-07-015-16/+13
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the directories: - app/assets/javascripts/error_tracking_settings - app/assets/javascripts/filtered_search - app/assets/javascripts/projects - app/assets/javascripts/releases - app/assets/javascripts/repository
* | | Merge branch '45120-fix-ide-editor-to-update-size-on-show-change' into 'master'Phil Hughes2019-07-011-7/+27
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix IDE editor to update dimensions on show change Closes #45120 See merge request gitlab-org/gitlab-ce!30135
| * | Fix IDE editor to update dimensions on show change45120-fix-ide-editor-to-update-size-on-show-changePaul Slaughter2019-06-281-7/+27
| | |
* | | Allow collapsing all issue boardsMartin Hanzel2019-06-284-30/+92
| | | | | | | | | | | | | | | | | | All issue boards can now be collapsed via a button, re-ordered by dragging the header, and the vertical collapsed header style was reworked.
* | | Vue-i18n: javascripts/boards directoryEzekiel Kigbo2019-06-2810-57/+70
| | | | | | | | | | | | | | | i18n linting for .vue files under the app/javascripts/boards directory
* | | Merge branch 'leipert-absolute-scss-paths' into 'master'Mike Greiling2019-06-284-12/+12
|\ \ \ | |_|/ |/| | | | | | | | Use absolute paths for SCSS imports See merge request gitlab-org/gitlab-ce!30161
| * | Use absolute paths for SCSS importsLukas Eipert2019-06-284-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent update in [GitLab UI] and setting the [config.assets.paths] to include `node_modules` for the resolution of SCSS imports, allows us to have much nicer imports which don't rely on brittle relative paths. This change also forwards @gitlab/ui to the newest version [GitLab UI]: https://gitlab.com/gitlab-org/gitlab-ui/merge_requests/602 [config.assets.paths]: https://gitlab.com/gitlab-org/gitlab-ce/blob/d9026d0ffa0/config/application.rb#L169
* | | Merge branch '10087-settings-pannel' into 'master'63463-follow-up-from-insights-is-now-ga62296-conform-on-single-icon-for-dropdown-buttons-which-align-with-design-systemPhil Hughes2019-06-282-27/+55
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Moves EE differences for app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue Closes gitlab-ee#10087 See merge request gitlab-org/gitlab-ce!30127
| * | | Moves EE code into a mixin10087-settings-pannelFilipa Lacerda2019-06-282-27/+55
| | | |
* | | | Use GraphQL API to fetch last commit data for treePhil Hughes2019-06-284-84/+89
| |/ / |/| |
* | | Merge branch 'id-extract-widget-into-different-request' into 'master'Ash McKenzie2019-06-283-4/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Extract MR's widget into a separate request Closes #62723 See merge request gitlab-org/gitlab-ce!29979
| * | | Extract MR's widget into a separate endpointid-extract-widget-into-different-requestIgor Drozdov2019-06-283-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | This commits extracts /merge_requests/1.json?serializer=widget Into a separate /merge_requests/1/widget.json endpoint This will allow to use caching for this request