summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '63976-discussion-sticky-header' into 'master'Phil Hughes2019-07-051-1/+1
|\ | | | | | | | | | | | | Fix top position of sticky file header on discussion tab Closes #63976 See merge request gitlab-org/gitlab-ce!30410
| * Fix top position of sticky file header on discussion tabAnnabel Dunstone Gray2019-07-051-1/+1
| |
* | Remove unresolved class and fixed height in discussion headerDavid Palubin2019-07-052-19/+8
|/
* Merge branch 'fetch-forked-projects-create-mr' into 'master'Filipa Lacerda2019-07-056-5/+275
|\ | | | | | | | | | | | | Create private merge requests in forks Closes #58583 See merge request gitlab-org/gitlab-ce!29984
| * Create private merge requests in forksPhil Hughes2019-07-056-5/+275
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/58583
* | Merge branch 'fix-divergence-graph-error' into 'master'Filipa Lacerda2019-07-051-1/+3
|\ \ | | | | | | | | | | | | | | | | | | Fix divergence graph loading error Closes #64143 See merge request gitlab-org/gitlab-ce!30393
| * | Fix divergence graph loading errorPhil Hughes2019-07-051-1/+3
| | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64143
* | | Fix alert creation dropdown menuSarah Yasonik2019-07-051-3/+14
|/ /
* | Change 'Todo' to 'To Do'Christie Lenneville2019-07-042-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we label items to be done as "Todo." This is grammatically incorrect and (therefore) confusing—especially to our Spanish-speaking users for whom "todo" has a specific and unrelated meaning. We should use "To Do" and always use it as singular (not "To Dos"). Updates to wording in a few places per MR (ee) discussion Updating locale/gitlab.pot Updates to wording in a few places per MR (ee) discussion Updating locale/gitlab.pot
* | Copy content from BoardService to boardsStoreWinnie Hellmann2019-07-043-59/+131
| | | | | | | | (cherry picked from commit 813299edd83ace98256b7fc9302f586f0dc2cabc)
* | Create EE-specific initNewListDropdown() functionWinnie Hellmann2019-07-041-1/+1
| | | | | | | | (cherry picked from commit 844666193f0740ab9c5f91d60d61acb6ce14cfaf)
* | Merge branch '12368-main-js' into 'master'Phil Hughes2019-07-042-0/+3
|\ \ | | | | | | | | | | | | Resolve CE/EE diff in main.js See merge request gitlab-org/gitlab-ce!30347
| * | Resolve CE/EE diff in main.js12368-main-jsLukas Eipert2019-07-042-0/+3
| | | | | | | | | | | | | | | Moving ee/main.js to ee/main_ee.js allows to add a noop file in CE and utilize ee_else_ce.
* | | Merge branch 'nfriend-make-haml-tooltip-delay-user-configurable' into 'master'Fatih Acet2019-07-041-0/+4
|\ \ \ | | | | | | | | | | | | | | | | Allow vanilla JS tooltip delay to be customized through localStorage See merge request gitlab-org/gitlab-ce!30196
| * | | Allow (Haml) tooltip delay customization via localStoragenfriend-make-haml-tooltip-delay-user-configurableNathan Friend2019-06-281-0/+4
| | | |
* | | | Extract mounting of multiple boards switcherWinnie Hellmann2019-07-042-0/+5
| | | |
* | | | Vue-i18n: app/assets/javascripts/sidebar directoryEzekiel Kigbo2019-07-047-28/+57
| | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/sidebar directory
* | | | Vue-i18n: app/assets/javascripts/notes directoryEzekiel Kigbo2019-07-049-50/+90
| |/ / |/| | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/notes directory
* | | Use gl-empty-state for monitor chartslittle-cluster-health-charts-ceSimon Knox2019-07-042-37/+34
| |/ |/| | | | | Move a unit test to jest and use snapshot tests
* | Add salesforce logoMałgorzata Ksionek2019-07-031-0/+0
| |
* | Merge branch '55487-enable-group-terminals-button' into 'master'Fatih Acet2019-07-031-11/+0
|\ \ | | | | | | | | | | | | | | | | | | Enable terminals button for group clusters Closes #55487 See merge request gitlab-org/gitlab-ce!30255
| * | Enable terminals button for group clusters55487-enable-group-terminals-buttonTiger2019-07-021-11/+0
| | |
* | | 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