Commit Graph

1424 Commits

Author SHA1 Message Date
Filipa Lacerda f1ef373b3b Merge branch 'master' into 37179-dashboard-project-dropdown
* master: (65 commits)
  Upgrade mail and nokogiri gems due to security issues
  Link out to stackoverflow answer on setting swappiness
  Document swappiness recomendations in the requirements doc
  Fix invalid attribute used for time-ago-tooltip component
  Update latest artifacts doc
  Add changelog entry for flipping verify_certificates
  Default LDAP config verify_certificates to true
  Update share project with groups docs
  remove accidental console.log from karma tests
  update specs to match reorganized monitoring components
  Remove tooltips from new sidebar
  Use `git update-ref --stdin -z` to delete refs
  Don't use public_send in destroy_conditionally! helper
  Remove unused expressions policy from ci/cd config
  Simplify code for appending strategies in CI/CD config
  Raise exception when simplifiable ci entry incomplete
  Add changelog entry
  Fix MySQL failure for emoji autocomplete
  max-width for lazy-loaded images (this was removed in the original MR through merge resolution most probably)
  Make namespace dropdown on new project page consistent
  ...
2017-08-31 09:33:08 +01:00
Tim Zallmann 90eb9e2b6d Merge branch 'fly-out-nav-jump-fix' into 'master'
Fixed fly-out nav jumping

Closes #36699

See merge request !13690
2017-08-31 06:32:41 +00:00
Fatih Acet 4c600fe719 Merge branch 'refactor-prometheus-graph-layout' into 'master'
Rename prometheus Vue components

See merge request !13938
2017-08-30 21:01:04 +00:00
Clement Ho cc81a40dcc Fix invalid attribute used for time-ago-tooltip component 2017-08-30 18:50:06 +00:00
Mike Greiling 4b892a5f07 update specs to match reorganized monitoring components 2017-08-30 11:11:19 -05:00
Filipa Lacerda 0232cabca3 puts back `function` statements 2017-08-30 15:45:54 +01:00
Filipa Lacerda 4342f81af2 Removes disabled state from projects dropdown in dashboard page 2017-08-30 15:16:37 +01:00
Filipa Lacerda dacb633845 Merge branch '35010-make-identicon-shared' into 'master'
Make Identicon for avatars a shared component

Closes #35010

See merge request !13919
2017-08-30 08:32:24 +00:00
Hiroyuki Sato 7187395ef1 Add filter by my reaction 2017-08-30 07:48:55 +00:00
kushalpandya 8d024db629 Update spec initialization with it being a shared component 2017-08-30 11:22:29 +05:30
kushalpandya ee0fae8eaf Renamed to `identicon` and make shared component 2017-08-30 11:21:43 +05:30
Filipa Lacerda 8e60636984 Merge branch 'changes-bar-sticky-fix' into 'master'
Fixes the diff changes buttons from toggling when scrolling

Closes #36698

See merge request !13894
2017-08-29 16:15:20 +00:00
Filipa Lacerda efd5e533b6 Prevents rendering empty badge when pipeline request fails 2017-08-29 14:10:10 +01:00
Phil Hughes ab3c8302af Fixes the diff changes buttons from toggling when scrolling
Closes #36698
2017-08-29 13:34:12 +01:00
Kamil Trzciński c842e29aad Merge branch '31409-fix-group-and-project-search-for-anonymous-users' into 'master'
Fix group and project search for anonymous users

Closes #31409

See merge request !13745
2017-08-25 12:25:37 +00:00
Fatih Acet 6752a3bbe3 Merge branch 'thenable-ajax-api-calls' into 'master'
Thenable ajax api calls

See merge request !13427
2017-08-24 12:13:42 +00:00
Nick Thomas 061472864c Fix group and project search for anonymous users 2017-08-24 11:32:50 +01:00
Luke "Jared" Bennett 9eb28bbf21
Added repo_service_spec for commitFlash and corrected repo_commit-Secion api spec 2017-08-23 14:44:49 +01:00
Luke "Jared" Bennett f3e4f10de2
Update repo_commit_section to spy service 2017-08-23 10:30:09 +01:00
Jacob Schatz c635e80103 Merge branch 'update-monaco-loader-test' into 'master'
Fix monaco loader test

See merge request !13682
2017-08-22 17:54:19 +00:00
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 9a93fd9ec4 Fixed fly-out nav jumping
Closes #36699
2017-08-19 20:41:23 +01:00
Mike Greiling c5b3632f90 fix failing specs in repo_commit_section_spec.js 2017-08-18 16:55:09 -05:00
Mike Greiling a7eb806e93 add global __webpack_public_path__ to eslint config 2017-08-18 16:05:53 -05:00
Mike Greiling 3695c6bc6d fix monaco loader test to not break with statically analyzed import statements 2017-08-18 16:00:12 -05: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