Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '63976-discussion-sticky-header' into 'master' | Phil Hughes | 2019-07-05 | 1 | -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 tab | Annabel Dunstone Gray | 2019-07-05 | 1 | -1/+1 |
| | | |||||
* | | Remove unresolved class and fixed height in discussion header | David Palubin | 2019-07-05 | 2 | -19/+8 |
|/ | |||||
* | Merge branch 'fetch-forked-projects-create-mr' into 'master' | Filipa Lacerda | 2019-07-05 | 6 | -5/+275 |
|\ | | | | | | | | | | | | | Create private merge requests in forks Closes #58583 See merge request gitlab-org/gitlab-ce!29984 | ||||
| * | Create private merge requests in forks | Phil Hughes | 2019-07-05 | 6 | -5/+275 |
| | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/58583 | ||||
* | | Merge branch 'fix-divergence-graph-error' into 'master' | Filipa Lacerda | 2019-07-05 | 1 | -1/+3 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix divergence graph loading error Closes #64143 See merge request gitlab-org/gitlab-ce!30393 | ||||
| * | | Fix divergence graph loading error | Phil Hughes | 2019-07-05 | 1 | -1/+3 |
| | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64143 | ||||
* | | | Fix alert creation dropdown menu | Sarah Yasonik | 2019-07-05 | 1 | -3/+14 |
|/ / | |||||
* | | Change 'Todo' to 'To Do' | Christie Lenneville | 2019-07-04 | 2 | -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 boardsStore | Winnie Hellmann | 2019-07-04 | 3 | -59/+131 |
| | | | | | | | | (cherry picked from commit 813299edd83ace98256b7fc9302f586f0dc2cabc) | ||||
* | | Create EE-specific initNewListDropdown() function | Winnie Hellmann | 2019-07-04 | 1 | -1/+1 |
| | | | | | | | | (cherry picked from commit 844666193f0740ab9c5f91d60d61acb6ce14cfaf) | ||||
* | | Merge branch '12368-main-js' into 'master' | Phil Hughes | 2019-07-04 | 2 | -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-js | Lukas Eipert | 2019-07-04 | 2 | -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 Acet | 2019-07-04 | 1 | -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-configurable | Nathan Friend | 2019-06-28 | 1 | -0/+4 |
| | | | | |||||
* | | | | Extract mounting of multiple boards switcher | Winnie Hellmann | 2019-07-04 | 2 | -0/+5 |
| | | | | |||||
* | | | | Vue-i18n: app/assets/javascripts/sidebar directory | Ezekiel Kigbo | 2019-07-04 | 7 | -28/+57 |
| | | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/sidebar directory | ||||
* | | | | Vue-i18n: app/assets/javascripts/notes directory | Ezekiel Kigbo | 2019-07-04 | 9 | -50/+90 |
| |/ / |/| | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/notes directory | ||||
* | | | Use gl-empty-state for monitor chartslittle-cluster-health-charts-ce | Simon Knox | 2019-07-04 | 2 | -37/+34 |
| |/ |/| | | | | | Move a unit test to jest and use snapshot tests | ||||
* | | Add salesforce logo | Małgorzata Ksionek | 2019-07-03 | 1 | -0/+0 |
| | | |||||
* | | Merge branch '55487-enable-group-terminals-button' into 'master' | Fatih Acet | 2019-07-03 | 1 | -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-button | Tiger | 2019-07-02 | 1 | -11/+0 |
| | | | |||||
* | | | Merge branch 'master' into michel.engelen/gitlab-ce-issue/55953 | Sean McGivern | 2019-07-03 | 35 | -214/+581 |
|\ \ \ | |||||
| * \ \ | Merge branch 'sh-improve-redis-peek' into 'master' | Sean McGivern | 2019-07-03 | 2 | -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-peek | Stan Hu | 2019-07-02 | 2 | -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 releases | Jason Goodman | 2019-07-03 | 1 | -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 commits | Natalia Tepluhina | 2019-07-03 | 18 | -127/+392 |
| | | | | | | | | | | | | | | | | | | | | - all commits squashed to make danger review happy | ||||
| * | | | | Replace slugifyWithHyphens with improved slugify function | Luke Ward | 2019-07-03 | 3 | -6/+13 |
| | | | | | |||||
| * | | | | Merge branch 'rj-fix-manual-order' into 'master' | Kushal Pandya | 2019-07-03 | 1 | -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-order | Rajat Jain | 2019-07-02 | 1 | -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 Zallmann | 2019-07-03 | 5 | -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-directory | Ezekiel Kigbo | 2019-07-01 | 5 | -14/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/ide directory | ||||
| * | | | | | Fix typo in updateResolvableDiscussionsCounts action | Winnie Hellmann | 2019-07-02 | 2 | -7/+7 |
| | |/ / / | |/| | | | |||||
| * | | | | Registry component now includes error messages | Nick Kipling | 2019-07-02 | 4 | -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 button | Michel Engelen | 2019-07-02 | 1 | -4/+4 |
| | | | | | |||||
* | | | | | prettified noteable_discussion component and updated tests | Michel Engelen | 2019-07-02 | 1 | -3/+1 |
| | | | | | |||||
* | | | | | replaced string `discussion` wit `thread` in noteable-discussion component | Michel Engelen | 2019-07-02 | 1 | -6/+6 |
| | | | | | |||||
* | | | | | replaced string `discussion` wit `thread` in note-form component | Michel Engelen | 2019-07-02 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | replaced string `discussion` with string `thread` in mr-widget component state | Michel Engelen | 2019-07-02 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | replaced string `discussion` with string `thread` in thread header | Michel Engelen | 2019-07-02 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | renamed `discussion` to `thread` in popover from reply form button | Michel Engelen | 2019-07-02 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | changed string `discussion` to `thread` in discussion (thread) counter | Michel Engelen | 2019-07-02 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | changed string `discussion` to `thread` in reply form | Michel Engelen | 2019-07-02 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | changed string `discussion` to `thread` in button and description title | Michel Engelen | 2019-07-02 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Allow adding new entries to existing path | Denys Mishunov | 2019-07-02 | 7 | -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 Pandya | 2019-07-02 | 1 | -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-folder | Denys Mishunov | 2019-07-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | Vue-i18n: app/assets/javascripts/clusters/ directory | Ezekiel Kigbo | 2019-07-02 | 3 | -9/+8 |
|/ / / | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/clusters/ directory | ||||
* | | | Vue-i18n: app/assets/javascripts/environments directory | Ezekiel Kigbo | 2019-07-01 | 4 | -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 Hughes | 2019-07-01 | 3 | -4/+13 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Pipeline actions cause full refresh" Closes #63590 See merge request gitlab-org/gitlab-ce!30190 |