root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
89,541 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

198 Commits

Author SHA1 Message Date
Andrew Fontaine ccdb8906d5 Link to Changed Page if Only One Change Present 
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.
 2019-02-25 09:52:47 -05:00
Paul Slaughter 09e58d3f8a
CE Port of Multiple merge request approval rules 
EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9001
 2019-02-13 05:35:17 -06:00
Natalia Tepluhina 407fd2edc7 Resolve "Override squash commit message" 2019-02-07 15:14:56 +00:00
Luke Duncalfe 2b7dd017af Allow custom squash commit messages 2019-02-06 12:33:11 +00:00
Clement Ho 6e085eea53 Merge branch 'sh-bump-chrome-golang-ci-image' into 'master' 
Bump CI image to use Chrome 71.0 and Golang 1.11

Closes #56614 and #55578

See merge request gitlab-org/gitlab-ce!24572
 2019-01-24 16:25:31 +00:00
Filipa Lacerda 3ed8078507 Merge branch '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
 2019-01-23 11:02:22 +00:00
Lukas Eipert 7db474ff78
Remove favicon check from mrWidgetOptions spec 
The method that actually creates the favicon is already unit tested, I
would have loved to mock it out, but ist is not possible without using
rewire. So I decided we just check that the favicon href is changed and
use that as a proxy for calling `setFaviconOverlay`
 2019-01-23 10:59:49 +01:00
Sam Bigelow c607b35824 Use 'delete' instead of 'remove' for source branch 
This is to match `git branch -D <branchname>`
 2019-01-22 12:57:01 -05:00
Natalia Tepluhina bce50453fa Resolve "When merging an MR, the squash checkbox isn't always supported" 2019-01-15 09:11:34 +00:00
Phil Hughes 81a52c27c3
Correctly show rebase state in MR widget 
Correctly shows the rebase state even if a merge requests pipeline
has failed.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/45942
 2019-01-10 12:37:42 +00:00
Phil Hughes aae6d17494
Disable resolve conflicts for protected branches 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53463
 2019-01-07 09:17:04 +00:00
Harry Kiselev 8a7a9506a1 Move merge request collaboration message into a constant. 2018-12-27 17:40:50 +03:00
Harry Kiselev c01444a79b Update condition to visibility collaboration status text, #44642. 2018-12-25 23:41:32 +03:00
Sam Bigelow 78f70545ea Set cached MRWidget SHA after rebase 
Update changelog to include Merge Request ID and Author

Update changelog to include Merge Request ID and Author
 2018-12-14 09:44:54 -05:00
Paul Slaughter 75d94c4cd0
Redesign of MR header sections (CE Port) 
- 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
 2018-11-30 08:17:13 -06:00
Phil Hughes 685e14f888 Merge branch '53578-fe-deployment-status' into 'master' 
Adds missing status in deployment widget

See merge request gitlab-org/gitlab-ce!23239
 2018-11-21 11:49:31 +00:00
Mike Greiling 9739e45ad9
Fix broken karma specs 2018-11-20 09:30:02 -06:00
Filipa Lacerda febc473f54
Adds missing status in deployment widget 
Renders created and canceled status in MR widget
 2018-11-20 14:46:21 +00:00
Simon Knox dfd1d6c4c9 Don't show memory usage graph for unmerged MRs 2018-11-19 07:06:38 +00:00
Filipa Lacerda 9736eff056 Removes feature flag for ciEnvironmentsStatusChanges 2018-11-12 16:33:59 +00:00
Filipa Lacerda 0cf721bdd2 Disable stop environment button while deployment is running 2018-11-06 15:14:42 +00:00
Filipa Lacerda 0c24995766 Renders unescaped `sprinft` string 2018-11-06 11:57:23 +00:00
Achilleas Pipinellis 7f47e13218 Merge branch 'gt-update-typos-in-comments-and-specs' into 'master' 
Fix typos in comments and specs

See merge request gitlab-org/gitlab-ce!22683
 2018-11-01 10:34:23 +00:00
George Tsiolis 733ae94921 Fix typos in comments and specs 2018-11-01 08:59:20 +02:00
Mike Greiling 160157a92b
Prettify remaining files with differences in CE and EE 2018-10-31 14:33:12 -05:00
Filipa Lacerda e89534796d Merge branch '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
 2018-10-31 10:29:44 +00:00
Filipa Lacerda 15db499757
Runs prettier on changed files 2018-10-30 11:03:11 +00:00
Filipa Lacerda 0ccacd7bbd
Prevents review app to render an empty dropdown. 
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.
 2018-10-30 10:45:54 +00:00
Alessio Caiazza dadc046d3a post merge pipeline and environments status 2018-10-29 11:34:41 +00:00
Filipa Lacerda 95cbd41f33
Regenerates pot files 
Makes documentation path a required prop
 2018-10-24 23:31:38 +02:00
Matija Čupić 9f0dbf8a44
Change CI status error message 2018-10-24 20:16:14 +02:00
Filipa Lacerda 25170fbe7b Frontend: Review app changes 2018-10-22 08:31:24 +00:00
Mike Greiling 7a3e605350
Resolve eslint violations 2018-10-17 11:18:17 -05:00
Mike Greiling f666026d71
Prettify all spec files 2018-10-17 11:18:17 -05:00
Johann Hubert Sonntagbauer 6f5723a169 enable jasmine/new-line-before-expect 2018-10-17 06:57:29 +02:00
Mark Chao b4297573c0 Only display merge commit SHA when it exists 2018-10-15 07:56:29 +00:00
Johann Hubert Sonntagbauer db4c1f665f enable jasmine/prefer-jasmine-matcher 2018-10-09 20:30:03 +02:00
Winnie Hellmann f183dba7c7 Cleanup polling of merge request widget in tests 2018-09-25 15:49:05 +02:00
Fatih Acet e0ab3ed554
Disable Web IDE button if user is not allowed to push the source branch. 2018-09-03 09:49:32 +02:00
Paul Slaughter 2810bae3b0 Update mr_widget_header to not show branch names in 'commits behind' text 
Also:
- Increased presence of 'commits behind' text
- Added link to target branch in 'commits behind' text
 2018-08-21 08:20:39 -05:00
Lukas Eipert 4ff134dfd4 Proper icon validator 2018-07-18 16:56:19 +00:00
Phil Hughes 9b9cbb4a1a
fixed test to correctly text relative URLs 
doesnt add query param if source & target projects match
 2018-07-13 09:13:36 +01:00
Phil Hughes 246ac06422
fixed karma specs 2018-07-12 16:05:06 +01:00
Phil Hughes 3a77664d1a Allow merge requests from forks to be opened in Web IDE 
Closes #47460
 2018-07-12 12:14:49 +02:00
Clement Ho bc5a92061d Redesign for mr widget info and pipelines section 2018-07-06 20:18:17 +00:00
Filipa Lacerda 1533dbf901
Uses long sha version of the merged commit in MR widget copy to clipboard button 2018-06-18 10:43:57 +01:00
Murat Dogan 423fcb476e mergeError message has been binded using v-html directive 2018-06-12 13:04:01 +00:00
George Tsiolis d5e9107107 Update MrWidgetAuthorTime and MRWidgetMerged spec 2018-06-11 14:14:51 +03:00
George Tsiolis 927d2459cd Rename MrWidgetAuthorTime vue component 2018-06-11 13:06:29 +03:00
Douwe Maan 290ca339ad Merge branch 'feature/customizable-favicon' into 'master' 
Customizable favicon

Closes #15661

See merge request gitlab-org/gitlab-ce!14497
 2018-06-07 16:54:41 +00:00