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

1400 Commits

Author SHA1 Message Date
Bryce Johnson 4add91b6e1 Use non-i18n values for setting new group-level issue/MR button text 2017-08-21 21:29:09 +00:00
Tim Zallmann 955d684cde Merge branch '36517-failing-karma-tests-for-chrome-60' into 'master' 
Resolve "Failing karma tests for Chrome 60"

Closes #36517

See merge request !13646
 2017-08-21 07:18:44 +00:00
Tim Zallmann 3d94e1e850 Merge branch 'issue-boards-closed-shows-empty-label' into 'master' 
Fixed issue boards closed list displaying empty label

Closes #36650

See merge request !13658
 2017-08-21 07:04:19 +00:00
Phil Hughes ad46dcca40
Fixed issue boards closed list displaying empty label 
Closes #36650
 2017-08-18 10:57:02 +01:00
Mike Greiling d4cb1ec9e9 fix unnecessarily long gl.utils.backOff test 2017-08-18 03:01:23 -05:00
Mike Greiling 2f35a266e1 fix test failures in text_utility_spec.js on Chrome 60 2017-08-18 02:50:11 -05:00
Mike Greiling e289b8cccb fix test failures in board_new_issue_spec.js on Chrome 60 2017-08-17 23:42:28 -05:00
Regis e9f85bf179 change to 'Not confidential' 2017-08-16 09:55:17 -06:00
Rémy Coutable 7b68bdce15 Merge branch 'rs-trailingwhitespace-cop' into 'master' 
Enable Layout/TrailingWhitespace cop and auto-correct offenses

See merge request !13573
 2017-08-16 10:27:46 +00:00
Tim Zallmann aae2349439 Merge branch 'safari-fly-out-fix' into 'master' 
Fix the fly-out menu in the sidebar not displaying in Safari

Closes #36441

See merge request !13445
 2017-08-16 09:10:36 +00:00
Jacob Schatz 2024198da7 Many Repo Fixes 2017-08-15 19:53:41 +00:00
Robert Speicher 142b9ec4a0 Fix two additional violations caused by previous changes 2017-08-15 15:53:16 -04:00
Bryce Johnson 8551997753 Repo Editor Fixes 2017-08-15 18:16:42 +00:00
Robert Speicher 4edfad9678 Enable Layout/TrailingWhitespace cop and auto-correct offenses 2017-08-15 13:44:37 -04:00
Clement Ho fe09c25d68 Merge branch '36450_confi_polish' into 'master' 
Change Confidential Message When Visible - UI Polish

See merge request !13551
 2017-08-15 13:50:07 +00:00
Phil Hughes b5a773923e
Fix the fly-out menu in the sidebar not displaying in Safari 2017-08-15 09:28:00 +01:00
Winnie Hellmann d2b4109b08 Display GPG status loading spinner only when Ajax request is made 2017-08-15 08:20:35 +00:00
Phil Hughes b70ae21416 Merge branch '34371-pipeline-schedule-vue-files' into 'master' 
Move callout to vue file and remove svg from data function to improve performance

See merge request !13539
 2017-08-15 07:46:34 +00:00
Regis aaaf3ebef6 change message and change spec 2017-08-14 17:47:24 -06:00
Jacob Schatz 0ec54b8ff7 Merge branch 'repo-fixes-e' into 'master' 
Repo fixes part E

See merge request !13472
 2017-08-14 22:54:43 +00:00
Eric Eastwood 6bf4a06ee9 Remove overflow tabs logic (no longer used) 
Fix
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143794
 2017-08-14 11:10:55 -05:00
Eric Eastwood 15f3741183 Remove loading state from repo_tab 
Fix
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143710
 2017-08-14 11:09:22 -05:00
Eric Eastwood ecb7c534f6 Use promise syntax with Helper.getContent 
Fix
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143217
 2017-08-14 11:09:20 -05:00
Eric Eastwood f1e1113bf4 Split out linkClicked and add tests 
Fix
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143174
 2017-08-14 11:03:36 -05:00
Filipa Lacerda 660ba032d5 Move callout to vue file and remove svg from data function to improve performance 2017-08-14 16:22:48 +01:00
Phil Hughes 449a84fe40
fixed up specs caused by left over elements in the body 2017-08-14 08:59:13 +01:00
Phil Hughes 640cbb00e3
Add dynamic navigation tunnel to fly-out menus 2017-08-14 08:59:13 +01:00
Robert Speicher c8b802471b Enable the RSpec/HookArgument cop and auto-correct offenses 2017-08-10 19:29:42 -04:00
Phil Hughes 3fc89919a8
removed global use of breakpoint checker 2017-08-10 14:02:30 +01:00
Phil Hughes 61033b2d4f
Increase performance of the breakpoint size checker 2017-08-10 12:38:45 +01:00
Phil Hughes dd3e7202ab
Removed display styles when hiding the fly out navigation 
Closes #36224
 2017-08-09 15:32:56 +01:00
winh d1500e898b Restore blob fixture for JavaScript tests 2017-08-08 23:25:01 +02:00
Phil Hughes 9a26f4b3e2 Fix fly-out navigation not showing for active items in collapsed sidebar 2017-08-08 19:27:00 +00:00
Filipa Lacerda 6a6a1e5b9e Merge branch '35052-please-select-a-file-when-attempting-to-upload-or-replace-from-the-ui' into 'master' 
Resolve "'Please select a file' when attempting to upload or replace from the UI"

Closes #35052

See merge request !12863
 2017-08-08 14:45:49 +00:00
Simon Knox f363479808 disable file upload button while uploading 
hide placeholder text when files have been added
vertically center dropzone area content
close modal after file upload succeeds
 2017-08-08 22:12:08 +10:00
Mike Greiling 0994bbf9dd Merge branch 'master' into ide 
* master: (86 commits)
  Show all labels
  33874 confidential issue redesign
  Exclude merge_jid on Import/Export attribute configuration
  Resolve "User dropdown in filtered search does not load avatar on `master`"
  Re-add column locked_at on migration rollback
  Group-level new issue & MR using previously selected project
  [EE Backport] Update log audit event in omniauth_callbacks_controller.rb
  more eagerly bail when the state is prevented
  Move locked_at removal to post-deployment migration
  Add class to other sidebars
  Improve mobile sidebar
  reduce iterations by keeping a count of remaining enablers
  Store & use ConvDev percentages returned by Version app
  Store MergeWorker JID on merge request, and clean up stuck merges
  Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
  DRY up caching in AbstractReferenceFilter
  Update CHANGELOG
  Add CHANGELOG entry
  Fix html structure Removes test for removed behavior
  Port form back to use form_tag
  ...
 2017-08-07 22:44:47 -05:00
Mike Greiling 1375db509a fix repo_edit_button_spec.js 2017-08-07 22:30:40 -05:00
Mike Greiling 24ac2ea80d fix test failures in repo_preview_spec.js 2017-08-07 22:08:54 -05:00
Regis Boudinot c543970d93 Show all labels 2017-08-08 01:52:18 +00:00
Stan Hu fd40bce9cc Merge branch '31207-clean-locked-merge-requests' into 'master' 
Resolve "Store MergeWorker JID on merge request, and clean up stuck merges"

Closes #31207

See merge request !13207
 2017-08-08 01:47:48 +00:00
Regis Boudinot f59bdbf0f1 33874 confidential issue redesign 2017-08-07 23:56:16 +00:00
Bryce Johnson 0532bff6d4 Group-level new issue & MR using previously selected project 2017-08-07 20:55:50 +00:00
Mike Greiling 7767ceef47 Merge branch 'master' into ide 
* master: (177 commits)
  Add changelog
  Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14
  Make contextual sidebar collapsible
  Fixed sidebar context header hover colors
  Use correct `Environment`-class within `Gitlab` namespace
  Remove gl.Activities from Commits page
  Move `let` calls inside the `describe` block using them
  Add `/assign me` alias support for assigning issuables to oneself
  GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError
  Use `broken_storage` in the fs_shards_spec.
  Eager load project creators for project dashboards
  Memoize a user's personal projects count
  Remove redundant query from User#recent_push
  Improve checking if projects would be returned
  Change spelling of gitlab-shell
  Remove unused #tree-holder
  Add custom linter for inline JavaScript to haml_lint
  Rename user_can_admin? because it's more accurate
  Synchronous zanata community contribution translation
  Add Korean translation to i18n
  ...
 2017-08-07 15:20:09 -05:00
Mike Greiling 1d5a306596 resolve eslint violations 2017-08-07 15:10:09 -05:00
Phil Hughes c2a8daf992 Merge branch '15664-remove-jquery-nicescroll' into 'master' 
Resolve "Remove jQuery Nicescroll"

Closes #15664, #30860, and #35885

See merge request !13262
 2017-08-07 19:35:45 +00:00
Sean McGivern 4c8b666893 Merge branch 'zj-project-templates' into 'master' 
Allow projects to be started from a template

Closes #32420

See merge request !13108
 2017-08-07 19:24:14 +00:00
Oswaldo Ferreira 0640b3d1d8 Store MergeWorker JID on merge request, and clean up stuck merges 2017-08-07 15:23:37 -03:00
Luke "Jared" Bennett b3b244587d
[ci skip] Add repo_edit_button_spec and repo_preview_spec 2017-08-07 15:23:59 +01:00
Luke "Jared" Bennett 79aad4e795
Remove fdescs 2017-08-07 13:20:51 +01:00
Luke "Jared" Bennett f64a7c4780
Remove repo_binary_viewer as it is no longer needed 2017-08-07 13:10:28 +01:00