Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add dynamic timer for delayed jobs in job listwinh-job-list-dynamic-timer | Winnie Hellmann | 2018-11-01 | 1 | -0/+16 |
| | |||||
* | Merge branch '52382-filter-milestone-api-none-any' into 'master' | Sean McGivern | 2018-11-01 | 1 | -2/+2 |
|\ | | | | | | | | | | | | | Resolve "Filter by `None`/`Any` for milestone in issues/mrs API" Closes #52382 See merge request gitlab-org/gitlab-ce!22637 | ||||
| * | Update search bar token for None and Any | Heinrich Lee Yu | 2018-11-01 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'gt-update-typos-in-comments-and-specs' into 'master' | Achilleas Pipinellis | 2018-11-01 | 7 | -9/+9 |
|\ \ | |/ |/| | | | | | Fix typos in comments and specs See merge request gitlab-org/gitlab-ce!22683 | ||||
| * | Fix typos in comments and specs | George Tsiolis | 2018-11-01 | 7 | -9/+9 |
| | | |||||
* | | Merge branch 'prettify-all-remaining-things' into 'master' | Filipa Lacerda | 2018-10-31 | 62 | -1593/+1797 |
|\ \ | | | | | | | | | | | | | Prettify remaining files with differences in CE and EE See merge request gitlab-org/gitlab-ce!22702 | ||||
| * | | Fix eslint violations | Mike Greiling | 2018-10-31 | 1 | -1/+1 |
| | | | |||||
| * | | Prettify remaining files with differences in CE and EE | Mike Greiling | 2018-10-31 | 62 | -1592/+1796 |
| | | | |||||
* | | | Merge branch 'leipert-migrate-gitlab-svgs' into 'master' | Mike Greiling | 2018-10-31 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | Rename @gitlab-org/gitlab-svgs to @gitlab/svgs See merge request gitlab-org/gitlab-ce!22714 | ||||
| * | | | Rename @gitlab-org/gitlab-svgs to @gitlab/svgsleipert-migrate-gitlab-svgs | Lukas Eipert | 2018-10-31 | 2 | -2/+2 |
| |/ / | |||||
* | | | Merge branch 'gt-fix-quick-links-button-styles' into 'master' | Annabel Dunstone Gray | 2018-10-31 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Fix quick links button styles Closes #52220 and #52063 See merge request gitlab-org/gitlab-ce!22657 | ||||
| * | | Fix quick links button styles | George Tsiolis | 2018-10-29 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'gl-ui-pagination' into 'master' | Phil Hughes | 2018-10-31 | 2 | -2/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | Remove gitlab-ui's pagination from global See merge request gitlab-org/gitlab-ce!22704 | ||||
| * | | | Remove gitlab-ui's pagination from globalgl-ui-pagination | Clement Ho | 2018-10-30 | 2 | -2/+4 |
| | | | | |||||
* | | | | Remove gitlab-ui's modal from global | Clement Ho | 2018-10-31 | 3 | -8/+13 |
| | | | | |||||
* | | | | Merge branch 'gt-fix-ide-typos-in-props' into 'master' | Phil Hughes | 2018-10-31 | 4 | -7/+7 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix typos in IDE props See merge request gitlab-org/gitlab-ce!22685 | ||||
| * | | | | Fix typos in IDE props | George Tsiolis | 2018-10-30 | 4 | -7/+7 |
| | |_|/ | |/| | | |||||
* | | | | Adds required prop to the post merge pipeline53386-broken-master | Filipa Lacerda | 2018-10-31 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Two different MRs updating the same code were merged and this was not caught prior to merge. This MR adds the missing prop to the post merge pipeline | ||||
* | | | | Merge branch ↵ | Filipa Lacerda | 2018-10-31 | 3 | -2/+18 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | '41545-gitlab-merge-request-status-could-not-connect-to-the-ci-server-please-check-your-settings-and-try-again' into 'master' Resolve "Reword error message for internal CI unknown pipeline status" Closes #53056 See merge request gitlab-org/gitlab-ce!22474 | ||||
| * | | | Fix rspec error text regex | Matija Čupić | 2018-10-24 | 1 | -1/+2 |
| | | | | |||||
| * | | | Regenerates pot files | Filipa Lacerda | 2018-10-24 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | Makes documentation path a required prop | ||||
| * | | | Updates CI/CD documentation link in MR widget | Filipa Lacerda | 2018-10-24 | 3 | -3/+18 |
| | | | | |||||
| * | | | Fix the troubleshooting docs link | Matija Čupić | 2018-10-24 | 2 | -3/+2 |
| | | | | |||||
| * | | | Add docs link | Matija Čupić | 2018-10-24 | 2 | -1/+3 |
| | | | | |||||
| * | | | Change CI status error message | Matija Čupić | 2018-10-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | Resolve "Create new group: Rename form fields and update UI" | Martin Wortschack | 2018-10-30 | 1 | -5/+7 |
| | | | | |||||
* | | | | Merge branch 'sh-fix-search-relative-urls' into 'master' | Clement Ho | 2018-10-30 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix search "all in GitLab" not working with relative URLs Closes #53259 See merge request gitlab-org/gitlab-ce!22644 | ||||
| * | | | | Fix search "all in GitLab" not working with relative URLssh-fix-search-relative-urls | Stan Hu | 2018-10-28 | 1 | -2/+2 |
| | |_|/ | |/| | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53259 | ||||
* | | | | Merge branch 'fl-missing-i18n' into 'master' | Mike Greiling | 2018-10-30 | 5 | -15/+18 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Adds missing i18n to pipelines table See merge request gitlab-org/gitlab-ce!22690 | ||||
| * | | | | Adds missing i18n to pipelines tablefl-missing-i18n | Filipa Lacerda | 2018-10-30 | 5 | -15/+18 |
| | | | | | |||||
* | | | | | Merge branch '53227-empty-list' into 'master' | Phil Hughes | 2018-10-30 | 2 | -24/+47 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Empty list for links to changed pages in Review App from MR Widget" Closes #53227 See merge request gitlab-org/gitlab-ce!22665 | ||||
| * | | | | Prevents review app to render an empty dropdown. | Filipa Lacerda | 2018-10-30 | 2 | -24/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a deployment has no files to show in the dropdown we fallback to the regular single button for the review app link. This commit moves the review app link into a component since it's used twice. | ||||
* | | | | | Merge branch 'winh-pipeline-actions-dynamic-timer' into 'master' | Filipa Lacerda | 2018-10-30 | 1 | -7/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add dynamic timer for delayed jobs in pipelines list See merge request gitlab-org/gitlab-ce!22621 | ||||
| * | | | | | Add dynamic timer for delayed jobs in pipelines listwinh-pipeline-actions-dynamic-timer | Winnie Hellmann | 2018-10-29 | 1 | -7/+3 |
| | | | | | | |||||
* | | | | | | Backport ee 7203 sticky logs topbar | Simon Knox | 2018-10-30 | 2 | -73/+99 |
| | | | | | | |||||
* | | | | | | Fixes diff discussions not being fully removedmr-diff-discussion-deletion | Phil Hughes | 2018-10-30 | 2 | -8/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where a discussion on a none changed line would not get fully removed and therefore leave the comment row empty. This was caused by the discussiob being added to the right when it shouldnt of been This also fixes a very rare edge case where discussions would get added twice to diff lines causing a Vue rendering warning Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53317 | ||||
* | | | | | | Renaming Secret Variables in the codebase | Marcel Amirault | 2018-10-30 | 3 | -3/+3 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Adding tests for filtering activities/comments in issues | Ramya Authappan | 2018-10-30 | 1 | -4/+3 |
| | | | | | |||||
* | | | | | Merge remote-tracking branch 'origin/master' into dev-master | Jan Provaznik | 2018-10-30 | 14 | -46/+46 |
|\ \ \ \ \ | |||||
| * | | | | | Update gitlab-ui to 1.9.0 | Clement Ho | 2018-10-29 | 14 | -46/+46 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge remote-tracking branch 'origin/master' into dev-master | DJ Mountney | 2018-10-29 | 117 | -1563/+1933 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix broken "Show whitespace changes" button on MR "Changes" tab | Jacques Erasmus | 2018-10-29 | 1 | -6/+6 |
| | | | | | |||||
| * | | | | Remove all tables from Pipeline page when there is no job for the Pipeline | Takuya Noguchi | 2018-10-29 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'ce-7103-show-milestone-dates-within-tooltips' into 'master' | Phil Hughes | 2018-10-29 | 2 | -20/+40 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport: Show actual Milestone dates within tooltips for Milestones in Epics sidebar See merge request gitlab-org/gitlab-ce!22653 | ||||
| | * | | | | Update tooltip for when no date is present, port back EE changesce-7103-show-milestone-dates-within-tooltips | Kushal Pandya | 2018-10-29 | 2 | -20/+40 |
| | | |/ / | | |/| | | |||||
| * | | | | post merge pipeline and environments status | Alessio Caiazza | 2018-10-29 | 4 | -25/+95 |
| | | | | | |||||
| * | | | | Merge branch '52383-ui-filter-assignee-none-any' into 'master' | Sean McGivern | 2018-10-29 | 1 | -1/+6 |
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | Add None/Any options for assignee in search bar Closes #52383 See merge request gitlab-org/gitlab-ce!22599 | ||||
| | * | | | Add None/Any options for assignee in search bar | Heinrich Lee Yu | 2018-10-26 | 1 | -1/+6 |
| | | | | | |||||
| * | | | | Merge branch 'prettify-all-the-things-4' into 'master' | Tim Zallmann | 2018-10-26 | 42 | -631/+626 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Prettify all the things (part 4) See merge request gitlab-org/gitlab-ce!22253 | ||||
| | * \ \ \ | Merge branch 'master' into 'prettify-all-the-things-4'prettify-all-the-things-4 | Mike Greiling | 2018-10-26 | 302 | -4765/+6168 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue |