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

1636 Commits

Author SHA1 Message Date
Tim Zallmann 6c5837ae49 Merge branch '37105-monitoring-graph-axes-labels-are-inaccurate-and-inconsistent' into 'master' 
Resolve "Monitoring graph axes labels are inaccurate and inconsistent"

Closes #37105

See merge request gitlab-org/gitlab-ce!14258
 2017-10-06 07:20:34 +00:00
Fatih Acet 64a6552b51 Merge branch '38389-allow-merge-without-success' into 'master' 
Allow merge when no pipeline success

Closes #38389

See merge request gitlab-org/gitlab-ce!14633
 2017-10-05 21:56:53 +00:00
Jose Ivan Vargas 790bc25dcd fix linter errors and karma specs 2017-10-05 13:00:33 -05:00
Tim Zallmann d55216c092 Merge branch '38031-monitoring-hover-info-is-clipped' into 'master' 
Resolve "Monitoring hover info is clipped"

Closes #38031

See merge request gitlab-org/gitlab-ce!14514
 2017-10-05 10:48:06 +00:00
Jose Ivan Vargas Lopez 9857ba1871 Resolve "Hover and legend data should be linked" 2017-10-05 08:52:06 +00:00
Douwe Maan 26c1fea29f Merge branch 'jramsay-fix-file-list-title-case' into 'master' 
Fix inconsistent use of sentence case

See merge request gitlab-org/gitlab-ce!14668
 2017-10-05 08:00:10 +00:00
Eric Eastwood 6a5b2fe894 Allow merge when no pipeline success 
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38389
 2017-10-05 01:46:16 -05:00
Jacob Schatz 8921af39e7 Merge branch '37229-mr-widget-status-icon' into 'master' 
improve merge request widget status icon UX

Closes #37229

See merge request gitlab-org/gitlab-ce!14200
 2017-10-05 01:34:39 +00:00
James Ramsay 8f2b109363 Fix inconsistent use of sentence case 2017-10-04 15:44:18 -04:00
Fatih Acet 9678650761 Merge branch '36742-hide-close-mr-button-on-merge' into 'master' 
Hide close MR button after merge without reloading page

Closes #36742

See merge request gitlab-org/gitlab-ce!14122
 2017-10-04 09:24:28 +00:00
Filipa Lacerda 12d275adce Merge branch 'acet-disabled-comment-textarea-while-requesting' into 'master' 
Disable comment textarea while submitting a new comment.

Closes #37858

See merge request gitlab-org/gitlab-ce!14541
 2017-10-04 08:30:07 +00:00
Grzegorz Bizon c958c201b7 Merge branch '31050-registry-image-lists' into 'master' 
Lazy load and paginate registry image list

Closes #31050

See merge request gitlab-org/gitlab-ce!14303
 2017-10-04 07:58:34 +00:00
Tim Zallmann 23e6b17b3e Merge branch 'winh-sprintf' into 'master' 
Add basic sprintf implementation to JavaScript

See merge request gitlab-org/gitlab-ce!14506
 2017-10-03 15:56:40 +00:00
Jose Ivan Vargas 3130262e88 Merge branch 'master' into 38031-monitoring-hover-info-is-clipped 2017-10-03 09:46:11 -05:00
Winnie Hellmann b509588a28 Add basic sprintf implementation to JavaScript 2017-10-03 14:46:19 +02:00
Fatih Acet cba95d9e32 Add tests for handle save method of the comment form. 2017-10-03 15:07:37 +03:00
Filipa Lacerda 7cd2b75c37 Merge branch 'mr-widget-merged-date-tooltip' into 'master' 
Fixes merge request widget date tooltip inconsistencies

Closes #38545

See merge request gitlab-org/gitlab-ce!14578
 2017-10-03 09:50:14 +00:00
Simon Knox d54983885b Merge remote-tracking branch 'origin' into 37229-mr-widget-status-icon 2017-10-03 08:41:33 +11:00
Valery Sizov a0ac2d932c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_ee 2017-10-02 13:15:46 +03:00
Tim Zallmann 209d7575b6 Merge branch '34366-issue-sidebar-don-t-render-participants-in-collapsed-state' into 'master' 
Resolve "Issue Sidebar : Don't render participants in collapsed state"

Closes #34366

See merge request gitlab-org/gitlab-ce!14270
 2017-10-02 08:23:07 +00:00
Tim Zallmann 147c46cca1 Merge branch '38052-use-simple-api-for-projects' into 'master' 
Use `simple=true` for projects API in Projects dropdown for better search performance

Closes #38052

See merge request gitlab-org/gitlab-ce!14585
 2017-10-02 07:39:07 +00:00
Eric Eastwood 439e3f0735 Port semi-linear merge strategy to CE (mostly FE) 2017-09-29 14:13:35 -05:00
Filipa Lacerda 49fdaf9ee8 Merge branch 'hash-mr-scroll-load' into 'master' 
Fixed anchored content not being scrolled into view

Closes #38326

See merge request gitlab-org/gitlab-ce!14562
 2017-09-29 15:14:22 +00:00
kushalpandya 4a17ac29b8 Use `simple=true` for projects API for better performance 2017-09-29 20:36:44 +05:30
Jacob Schatz 5307844c9a Merge branch 'dm-json-page-title' into 'master' 
Use backend-provided page title in repo editor

Closes #36029

See merge request gitlab-org/gitlab-ce!13763
 2017-09-29 13:22:27 +00:00
Tim Zallmann ef22b0dc81 Title has now its own test 2017-09-29 13:43:39 +02:00
Tim Zallmann 705a840d2e Not the Test will also work with other tests before 2017-09-29 12:02:43 +02:00
Phil Hughes e178eb782a
Fixes merge request widget date tooltip inconsistencies 
Previously the merge request widget would use the `updated_at` date as
the tooltip text for both closed & merged states. This is incorrect as
the `updated_at` date is actually changed when a user updates merge
request through commenting, description changes or anything else.

The widget states for merged & closed events now use their own event
object which holds their own `updated_at` date string. Also this text
has been correctly formatted through our date utilities to correctly
display the right timezone data in a user friendly way.

Closes #38545
 2017-09-29 10:31:10 +01:00
Phil Hughes d729aa7383
spec fix 2017-09-29 09:40:21 +01:00
Filipa Lacerda a481337b6a Merge branch 'remove-target-dd' into 'master' 
Remove target dd

Closes #38485

See merge request gitlab-org/gitlab-ce!14558
 2017-09-29 08:33:10 +00:00
Phil Hughes 333cb069af
Fixed anchored content not being scrolled into view 
Correctly scrolls anchored content into view when the user loads the
page. This is most obvious when the user loads a link note in a
merge request & the page does not scroll down to the note.

Closes #38326
 2017-09-29 09:24:56 +01:00
Tim Zallmann 0647484c61 Added Test for PageTitle / Removed Gitlab Part from TItle 2017-09-29 09:59:09 +02:00
Phil Hughes 5e850d5bae Merge branch '38528-build-url' into 'master' 
Fixes data parameter not being sent in ajax request for jobs log

Closes #38528

See merge request gitlab-org/gitlab-ce!14564
 2017-09-29 07:52:13 +00:00
Jacob Schatz 42218fcaa7 Fix karma test 2017-09-28 21:24:14 -04:00
Eric Eastwood 3468ca835d Merge branch 'master' into ff_port_from_ee 
Conflicts:
	app/models/project.rb
	db/schema.rb
 2017-09-28 16:59:49 -05:00
Jacob Schatz 3d899a7d2e Merge branch 'acet-repo-editor-prevent-extra-request' into 'master' 
RepoEditor: Prevent extra network call for already opened files.

Closes #38256

See merge request gitlab-org/gitlab-ce!14489
 2017-09-28 19:52:36 +00:00
Filipa Lacerda 2b407b9140
Fixes data parameter not being sent in ajax request for jobs log 2017-09-28 17:24:24 +01:00
Jacob Schatz cd5896ed7b Merge branch 'jramsay-spelling-occurred' into 'master' 
Fix spelling of occurred

See merge request gitlab-org/gitlab-ce!14488
 2017-09-28 15:56:38 +00:00
Luke "Jared" Bennett 9987aa0991
Merge remote-tracking branch 'origin/master' into 34366-issue-sidebar-don-t-render-participants-in-collapsed-state 2017-09-28 13:39:57 +01:00
Luke "Jared" Bennett ba76ddf281
Only trigger loadCheck on open toggle, not close. Update specs and add right_sidebar_spec test for additions 2017-09-28 13:29:32 +01:00
Luke "Jared" Bennett 68269d7a40
issuable_context_spec review changes 2017-09-28 13:29:32 +01:00
Luke "Jared" Bennett baa08b5657
Finish issuable_context_spec 2017-09-28 13:29:32 +01:00
Luke "Jared" Bennett 0690381080
Add issauble_context_spec 2017-09-28 13:29:32 +01:00
Filipa Lacerda a5357cf332 Merge branch 'master' into 31050-registry-image-lists 
* master: (91 commits)
  refactor emails service
  fix update service
  refactor users update service
  refactor keys controller
  refactor some controllers to make them EE friendly
  fix specs
  fix users update service
  update initializers
  refactor services to match EE signature
  Change recommended MySQL version to 5.6
  Clean merge_jid whenever necessary on the merge process
  Rolling back change to n+1 detection
  Breadcrumbs receives padding when double lined
  Add EEP to headings
  Added some Gitaly docs to `docs/development`
  Check orientation of profile image
  Fixes commit comments in side-by-side diff view
  Update CHANGELOG.md for 10.0.2
  Fix linting errors in locale/index.js
  Update CI parallelization description
  ...
 2017-09-28 11:29:17 +01:00
Fatih Acet c25e83b536 RepoEditor: Prevent extra network call for already opened files. 2017-09-27 23:19:02 +03:00
Jacob Schatz e9f7d26f07 Merge branch 'acet-repo-editor-fix-link-linking' into 'master' 
RepoEditor: Implement line and range linking.

Closes #38254

See merge request gitlab-org/gitlab-ce!14448
 2017-09-27 17:23:16 +00:00
Jose Ivan Vargas c146177094 Fixed deployment flag having content hidden when being too far right 2017-09-27 11:37:23 -05:00
Filipa Lacerda 9034227749 Merge branch 'mr-side-by-side-breadcrumbs-container' into 'master' 
Stop breadcrumbs changing container when in side-by-side diff

Closes #37641

See merge request gitlab-org/gitlab-ce!14454
 2017-09-27 09:34:53 +00:00
Eric Eastwood 6f9a6d37a9 Merge branch 'master' into ff_port_from_ee 2017-09-26 16:24:54 -05:00
Eric Eastwood a48c07da98 Use js- classes instead of Vue refs in tests for some perf 
See
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14272#note_41419104
 2017-09-26 14:43:54 -05:00