Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Remove .raw from JavaScript fixture file names | Winnie Hellmann | 2019-03-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | There is nothing more to say but "Commits that change 30 or more lines across at least three files must describe these changes in the commit body" | |||||
* | | | Update merge request widget pipeline block | Nathan Friend | 2019-03-21 | 1 | -3/+80 | |
|/ / | | | | | | | | | | | This commit updates the pipeline block that appears on the merge request page to include information that will be exposed by the API as part of the post-merge pipeline feature. | |||||
* | | Merge branch 'renovate/gitlab-ui-2.x' into 'master' | Clement Ho | 2019-03-19 | 3 | -3/+3 | |
|\ \ | |/ |/| | | | | | Update dependency @gitlab/ui to ^2.3.0 See merge request gitlab-org/gitlab-ce!26181 | |||||
| * | Fix failing tests | Brandon Labuschagne | 2019-03-18 | 3 | -3/+3 | |
| | | | | | | | | | | | | | | | | A number of the karma tests looked for the .fa-spinner class or the icon element used for the font awesome spinner class. These instances have been refactored to now look for the .spinner class instead. | |||||
* | | Merge branch '56970-fix-mr-stuck-loading-on-error' into 'master' | Phil Hughes | 2019-03-15 | 1 | -1/+19 | |
|\ \ | |/ |/| | | | | | Resolve "Merge request page loses state" See merge request gitlab-org/gitlab-ce!25988 | |||||
| * | Update merge status timeout to 0 | Paul Slaughter | 2019-03-14 | 1 | -1/+19 | |
| | | | | | | | | - Also stop polling if we get a bad response from the server. | |||||
* | | Added changelog entry | Natalia Tepluhina | 2019-03-13 | 2 | -9/+138 | |
|/ | | | | - fixed tests for edit components | |||||
* | Added a condition on squash message display | Natalia Tepluhina | 2019-03-07 | 1 | -3/+17 | |
| | | | | - also added a caret back to GlDropdown | |||||
* | Link to Changed Page if Only One Change Present | Andrew Fontaine | 2019-02-25 | 1 | -26/+55 | |
| | | | | | | Given a static page mapping, and a review app with a single static page change, the review app link will now go directly to that change instead of to the home page of the review app. | |||||
* | Resolve "Override squash commit message" | Natalia Tepluhina | 2019-02-07 | 4 | -51/+358 | |
| | ||||||
* | Merge branch ↵ | Filipa Lacerda | 2019-01-23 | 2 | -17/+17 | |
|\ | | | | | | | | | | | | | | | | | '25569-changing-wording-to-delete-when-referring-to-removing-a-branch' into 'master' Resolve "Changing wording to "Delete" when referring to removing a branch" Closes #25569 See merge request gitlab-org/gitlab-ce!23966 | |||||
| * | Use 'delete' instead of 'remove' for source branch25569-changing-wording-to-delete-when-referring-to-removing-a-branch | Sam Bigelow | 2019-01-22 | 2 | -17/+17 | |
| | | | | | | | | This is to match `git branch -D <branchname>` | |||||
* | | Resolve "When merging an MR, the squash checkbox isn't always supported" | Natalia Tepluhina | 2019-01-15 | 2 | -7/+159 | |
|/ | ||||||
* | Disable resolve conflicts for protected branches | Phil Hughes | 2019-01-07 | 1 | -33/+98 | |
| | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53463 | |||||
* | Set cached MRWidget SHA after rebase | Sam Bigelow | 2018-12-14 | 1 | -1/+1 | |
| | | | | | | Update changelog to include Merge Request ID and Author Update changelog to include Merge Request ID and Author | |||||
* | Redesign of MR header sections (CE Port) | Paul Slaughter | 2018-11-30 | 3 | -0/+171 | |
| | | | | | | | - https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8593 - Create mr-widget-icon to encapsulate circle icons - Decouple workflow L&F from mr-widget-heading - Decouple container L&F from mr-widget-heading | |||||
* | Merge branch '53578-fe-deployment-status' into 'master' | Phil Hughes | 2018-11-21 | 1 | -0/+28 | |
|\ | | | | | | | | | Adds missing status in deployment widget See merge request gitlab-org/gitlab-ce!23239 | |||||
| * | Adds missing status in deployment widget53578-fe-deployment-status | Filipa Lacerda | 2018-11-20 | 1 | -0/+28 | |
| | | | | | | | | Renders created and canceled status in MR widget | |||||
* | | Fix broken karma specs | Mike Greiling | 2018-11-20 | 4 | -5/+12 | |
|/ | ||||||
* | Don't show memory usage graph for unmerged MRs | Simon Knox | 2018-11-19 | 1 | -2/+25 | |
| | ||||||
* | Removes feature flag for ciEnvironmentsStatusChanges | Filipa Lacerda | 2018-11-12 | 1 | -44/+0 | |
| | ||||||
* | Disable stop environment button while deployment is running | Filipa Lacerda | 2018-11-06 | 1 | -0/+4 | |
| | ||||||
* | Renders unescaped `sprinft` string | Filipa Lacerda | 2018-11-06 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'gt-update-typos-in-comments-and-specs' into 'master' | Achilleas Pipinellis | 2018-11-01 | 1 | -1/+1 | |
|\ | | | | | | | | | 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 | 1 | -1/+1 | |
| | | ||||||
* | | Prettify remaining files with differences in CE and EE | Mike Greiling | 2018-10-31 | 1 | -36/+36 | |
| | | ||||||
* | | Merge branch ↵ | Filipa Lacerda | 2018-10-31 | 1 | -1/+10 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | '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 | |||||
| * | | Regenerates pot files | Filipa Lacerda | 2018-10-24 | 1 | -1/+10 | |
| | | | | | | | | | | | | Makes documentation path a required prop | |||||
| * | | Change CI status error message | Matija Čupić | 2018-10-24 | 1 | -1/+1 | |
| | | | ||||||
* | | | Runs prettier on changed files53227-empty-list | Filipa Lacerda | 2018-10-30 | 1 | -1/+1 | |
| | | | ||||||
* | | | Prevents review app to render an empty dropdown. | Filipa Lacerda | 2018-10-30 | 2 | -0/+58 | |
| |/ |/| | | | | | | | | | | | | | 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. | |||||
* | | post merge pipeline and environments status | Alessio Caiazza | 2018-10-29 | 1 | -60/+82 | |
|/ | ||||||
* | Frontend: Review app changes | Filipa Lacerda | 2018-10-22 | 1 | -0/+52 | |
| | ||||||
* | Resolve eslint violations | Mike Greiling | 2018-10-17 | 7 | -0/+12 | |
| | ||||||
* | Prettify all spec files | Mike Greiling | 2018-10-17 | 24 | -209/+300 | |
| | ||||||
* | enable jasmine/new-line-before-expect | Johann Hubert Sonntagbauer | 2018-10-17 | 13 | -0/+75 | |
| | ||||||
* | Only display merge commit SHA when it exists | Mark Chao | 2018-10-15 | 1 | -0/+10 | |
| | ||||||
* | enable jasmine/prefer-jasmine-matcher | Johann Hubert Sonntagbauer | 2018-10-09 | 1 | -1/+1 | |
| | ||||||
* | Disable Web IDE button if user is not allowed to push the source branch. | Fatih Acet | 2018-09-03 | 1 | -16/+29 | |
| | ||||||
* | Update mr_widget_header to not show branch names in 'commits behind' text | Paul Slaughter | 2018-08-21 | 1 | -6/+8 | |
| | | | | | | Also: - Increased presence of 'commits behind' text - Added link to target branch in 'commits behind' text | |||||
* | fixed test to correctly text relative URLside-merge-requests-forks | Phil Hughes | 2018-07-13 | 1 | -7/+27 | |
| | | | | doesnt add query param if source & target projects match | |||||
* | fixed karma specs | Phil Hughes | 2018-07-12 | 1 | -2/+9 | |
| | ||||||
* | Redesign for mr widget info and pipelines section | Clement Ho | 2018-07-06 | 2 | -5/+5 | |
| | ||||||
* | Uses long sha version of the merged commit in MR widget copy to clipboard ↵48050-add-full-commit-sha | Filipa Lacerda | 2018-06-18 | 1 | -2/+3 | |
| | | | | button | |||||
* | mergeError message has been binded using v-html directive | Murat Dogan | 2018-06-12 | 1 | -4/+19 | |
| | ||||||
* | Update MrWidgetAuthorTime and MRWidgetMerged spec | George Tsiolis | 2018-06-11 | 2 | -2/+2 | |
| | ||||||
* | Rename MrWidgetAuthorTime vue component | George Tsiolis | 2018-06-11 | 1 | -3/+3 | |
| | ||||||
* | fixed more specs | Phil Hughes | 2018-06-07 | 1 | -1/+11 | |
| | ||||||
* | Rename merge request widget author component | George Tsiolis | 2018-05-22 | 1 | -3/+3 | |
| | ||||||
* | Moves mr widget to a vue component | Filipa Lacerda | 2018-05-10 | 1 | -40/+0 | |
| | | | | | Prevents maintainer edit to render a blank div Properly names sha mismatch component |