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
56,342 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

1254 Commits

Author SHA1 Message Date
Filipa Lacerda 706d99aed8 Update Pipeline's badge count in Merge Request and Commits view to match real-time content 2017-07-14 15:52:54 +00:00
Robert Speicher 777ec21064 Merge branch 'mr-branch-link-use-tree' into 'master' 
MR branch link now links to tree instead of commits

Closes #34243

See merge request !12763
 2017-07-12 16:52:37 +00:00
Filipa Lacerda aaa78199c2 Update vue-resource 2017-07-12 14:47:09 +00:00
Clement Ho 6eeb638434 Make commits behind text a link to the target branch commits page 2017-07-11 11:49:22 -05:00
Phil Hughes 8906bbae38 Merge branch '34810-vue-pagination' into 'master' 
Prevent default click since we change the url manually

Closes #34810

See merge request !12721
 2017-07-10 08:08:54 +00:00
Filipa Lacerda b2b527a690 Update tests to test what the component renders and what the clicks calls 2017-07-07 22:23:13 +01:00
Jacob Schatz 5f8f555a66 Merge branch '30281-report-abusive-content-from-an-issue-or-merge-request' into 'master' 
Resolve "Report abusive content from an issue or merge request"

Closes #30281

See merge request !11786
 2017-07-07 20:23:27 +00:00
Filipa Lacerda 9803579e25 Prevent default click since we change the url manually 
Adds tests
 2017-07-07 18:09:02 +01:00
Kamil Trzciński a77158ff31 Merge branch 'feature/intermediate/32568-adding-variables-to-pipelines-schedules' into 'master' 
Add variables to pipelines schedules

Closes #32568

See merge request !12372
 2017-07-07 15:17:02 +00:00
Luke "Jared" Bennett f28cd19dde
Fix MR and issue specs 2017-07-07 16:05:17 +01:00
Tim Zallmann c88739ffa6 Merge branch 'es-class-syntax' into 'master' 
Refactor several javascript files to ES module syntax

See merge request !12683
 2017-07-07 14:24:05 +00:00
Luke "Jared" Bennett 848d868b9b
Fixed issue_spec and merge_request_spec for report toggle changes 2017-07-07 14:57:28 +01:00
Luke "Jared" Bennett d7c383a0ee
Fixed MR single button submit failure and attempted to tidy up close_reopen partials using issuable_helpers and setDisable will use true as default bool 2017-07-07 14:57:28 +01:00
Luke "Jared" Bennett 001c904f28
Remove inclusive JS imports 2017-07-07 14:57:00 +01:00
Luke "Jared" Bennett 421e41c9ce
Added specs 2017-07-07 14:57:00 +01:00
Shinya Maeda 08fba1327f merge from master 2017-07-07 16:12:13 +09:00
Mike Greiling 60a1118f16 refactor SigninTabsMemoizer class to ES module syntax 2017-07-06 13:59:52 -05:00
Mike Greiling 5c52ca9a0c refactor SingleFileDiff class to ES module syntax 2017-07-06 13:39:28 -05:00
Mike Greiling d990df7481 refactor TaskList class to ES module syntax 2017-07-06 13:05:58 -05:00
Mike Greiling 571de11eb6 refactor Todos class to ES module syntax 2017-07-06 12:57:01 -05:00
Tim Zallmann 55ceeda85c Merge branch '34655-label-field-for-setting-a-chart-s-legend-text-is-not-working' into 'master' 
Resolve "`label` field for setting a chart's legend text is not working"

Closes #34655

See merge request !12628
 2017-07-06 16:38:10 +00:00
Mike Greiling 6149c2e230 refactor VisibilitySelect class to ES module syntax 2017-07-06 10:10:02 -05:00
Mike Greiling 5d34237854 refactor ZenMode to ES module syntax 2017-07-06 10:10:01 -05:00
Phil Hughes bb918a2fd9 Merge branch 'revert-018f7e46' into 'master' 
Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'"

See merge request !12674
 2017-07-06 13:14:33 +00:00
Douwe Maan a33fb2132c Merge branch '18000-remember-me-for-oauth-login' into 'master' 
Fix `migration:path` build for "Honor the 'Remember me' parameter for OAuth-based login"

Closes #34713

See merge request !12668
 2017-07-06 12:59:21 +00:00
Jose Ivan Vargas 42d4b013ea Added test for the chart legend 2017-07-06 06:59:01 -05:00
Kamil Trzciński 9786e4fb0a Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'" 
This reverts merge request !12127
 2017-07-06 10:45:24 +00:00
Timothy Andrew 8d49a9fd58 Add Jasmine tests for `OAuthRememberMe` 2017-07-06 06:30:07 +00:00
Filipa Lacerda f040336545 Handles realtime with 2 states for environments table 2017-07-05 16:08:53 +00:00
Sean McGivern 8a3022a698 Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'" 
This reverts merge request !11963
 2017-07-05 16:01:40 +00:00
Sean McGivern 6df61942e9 Merge branch '18000-remember-me-for-oauth-login' into 'master' 
Honor the "Remember me" parameter for OAuth-based login

Closes #18000

See merge request !11963
 2017-07-05 12:41:06 +00:00
Eric Eastwood 5576214d0f Schedule pipelines with variables 
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32568
 2017-07-05 18:36:19 +09:00
Timothy Andrew 2ae8158c8c Add Jasmine tests for `OAuthRememberMe` 2017-07-04 12:29:39 +00:00
Jose Ivan Vargas 2a829d0f53 Fixed the y_label not setting correctly for each graph on the monitoring dashboard 2017-07-03 10:43:56 -05:00
Jacob Schatz e48f54b5b2 Merge branch 'enable-webpack-code-splitting' into 'master' 
Enable webpack code splitting

Closes #32989

See merge request !12032
 2017-06-30 20:55:09 +00:00
Clement Ho 8513072e96 Merge branch 'winh-issue-show-aftereach' into 'master' 
Remove empty afterEach() from issue_show app_spec.js

See merge request !12577
 2017-06-30 20:12:04 +00:00
Kushal Pandya 9e3ef082be Remove placeholder note when award emoji slash command is applied 2017-06-30 14:10:09 +00:00
Winnie Hellmann 553346a4f4 Remove empty afterEach() from issue_show app_spec.js 2017-06-29 22:31:58 +00:00
Sean McGivern 88c60307bd Merge branch 'dm-merge-request-creations-controller' into 'master' 
Split up MergeRequestsController

See merge request !12150
 2017-06-29 11:57:06 +00:00
Douwe Maan 70b05a8377 Split up MergeRequestsController 2017-06-28 18:17:44 -05:00
Mike Greiling f26d477865 dynamically import emoji helpers for AwardsHandler class 2017-06-28 13:04:34 -05:00
Clement Ho 500d3a990e Merge branch 'winh-no-current-user-search-bar' into 'master' 
Add condition if there is a current user to DropdownUser

See merge request !12415
 2017-06-28 16:16:46 +00:00
Tim Zallmann 5870fc5daf Merge branch 'cherry-pick-5ea675be' into 'master' 
Merge branch 'additional-metrics-dashboard' into '28717-additional-metrics-review-branch'

See merge request !12454
 2017-06-28 15:49:42 +00:00
Tim Zallmann 08ad0af49c Merge branch 'refactor-emoji-utils' into 'master' 
Refactor emoji helpers in preparation for async loading

See merge request !12432
 2017-06-28 05:51:30 +00:00
winh 6ab12777bc Introduce addClassIfElementExists utility 2017-06-27 20:37:30 +02:00
Bryce Johnson 2da314212f Slightly refactor pipeline schedules form in preparation for additions 2017-06-27 16:52:13 +00:00
Luke "Jared" Bennett 64b0a799f3 Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter submits twice and refreshes page" 2017-06-27 16:06:38 +00:00
winh abfb59109d Add failing test for #34141 2017-06-27 16:31:01 +02:00
Filipa Lacerda 99bdfd189b Merge branch 'issue-form-multiple-line-markdown' into 'master' 
Fixed multi-line markdown in issue edit form

Closes #34318

See merge request !12458
 2017-06-27 11:34:21 +00:00
Phil Hughes 018f7e46c7 Merge branch 'winh-mr-widget-no-pipeline' into 'master' 
Handle missing pipeline in merge request widget

Closes #32987

See merge request !12127
 2017-06-27 08:33:47 +00:00