summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Allow usage of any_projects? with an Arrayfix-any-projects-arrayYorick Peterse2017-08-151-0/+2
| | | | | | | In some cases we pass an Array to this method which would previously fail since Array does not respond to "limit_value". Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3646
* Display GPG status loading spinner only when Ajax request is madeWinnie Hellmann2017-08-153-2/+7
|
* Merge branch 'forks-count-cache' into 'master'Douwe Maan2017-08-155-1/+48
|\ | | | | | | | | Cache the number of forks of a project See merge request !13535
| * Cache the number of forks of a projectforks-count-cacheYorick Peterse2017-08-145-1/+48
| | | | | | | | | | | | | | | | | | | | | | The number of forks of a project doesn't change very frequently and running a COUNT(*) every time this information is requested can be quite expensive. We also end up running such a COUNT(*) query at least twice on the homepage of a project. By caching this data and refreshing it when necessary we can reduce project homepage loading times by around 60 milliseconds (based on the timings of https://gitlab.com/gitlab-org/gitlab-ce).
* | Fix edit merge request button inconsistent letter casingClement Ho2017-08-152-2/+2
| |
* | Merge branch '34533-speed-up-group-project-authorizations' into 'master'Douwe Maan2017-08-154-10/+53
|\ \ | | | | | | | | | | | | | | | | | | Speed up Group#user_ids_for_project_authorizations Closes #36182 See merge request !13508
| * | Speed up Group#user_ids_for_project_authorizationsNick Thomas2017-08-144-10/+53
| | |
* | | Merge branch '34371-pipeline-schedule-vue-files' into 'master'Phil Hughes2017-08-153-51/+60
|\ \ \ | | | | | | | | | | | | | | | | Move callout to vue file and remove svg from data function to improve performance See merge request !13539
| * | | Adds line to the end of the file34371-pipeline-schedule-vue-filesFilipa Lacerda2017-08-141-1/+1
| | | |
| * | | Move callout to vue file and remove svg from data function to improve ↵Filipa Lacerda2017-08-143-51/+60
| | | | | | | | | | | | | | | | performance
* | | | Merge branch 'repo-fixes-e' into 'master'Jacob Schatz2017-08-1412-86/+99
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Repo fixes part E See merge request !13472
| * | | | Add shared getFileExtension helper methodrepo-fixes-eEric Eastwood2017-08-142-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37146854
| * | | | Remove unused repo store keysEric Eastwood2017-08-142-17/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37147332
| * | | | Add comment about why we need to stop parsing JSONEric Eastwood2017-08-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37146815 See https://gitlab.slack.com/archives/C0GQHHPGW/p1501779964878178
| * | | | Use single js- wrapper class to show/hideEric Eastwood2017-08-144-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37146360
| * | | | Scroll total scroll width instead of fixed valueEric Eastwood2017-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed value could potentially be not enough Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37145886
| * | | | Switch single fa icon generation to inlineEric Eastwood2017-08-141-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37145729
| * | | | Remove duplicate setting of variableEric Eastwood2017-08-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37145640
| * | | | Reset monacoLoading on failureEric Eastwood2017-08-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37144070
| * | | | Remove overflow tabs logic (no longer used)Eric Eastwood2017-08-142-15/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143794
| * | | | Remove loading state from repo_tabEric Eastwood2017-08-141-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143710
| * | | | Make close/changed icon more accessibleEric Eastwood2017-08-141-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143527
| * | | | Use promise syntax with Helper.getContentEric Eastwood2017-08-142-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143217
| * | | | Split out linkClicked and add testsEric Eastwood2017-08-141-24/+21
| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143174
| * | | | Use v-else instead of duplicating logicEric Eastwood2017-08-142-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Fix http://192.168.1.135:3000/gitlab-org/gitlab-ce/blob/master/app/assets/javascripts/broadcast_message.js
| * | | | Move syntax highlighting into a methodEric Eastwood2017-08-101-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37142936
* | | | | Merge branch 'bvl-use-no-wrap-for-pot-file' into 'master'Rubén Dávila2017-08-142-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove newlines in translations See merge request !13531
| * | | | | Remove `\n` from translationsbvl-use-no-wrap-for-pot-fileBob Van Landuyt2017-08-142-2/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | They seem to confuse some translation tools and aren't rendered in HTML anyway.
* | | | | Merge branch '36385-pipeline-graph-dropdown' into 'master'Phil Hughes2017-08-141-0/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stops propagation for dropdown content in pipeline graph. Closes #36385 See merge request !13536
| * | | | | Stops propagation for dropdown content in pipeline graph. Applies the same ↵36385-pipeline-graph-dropdownFilipa Lacerda2017-08-141-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | behavior of the mini graph
* | | | | | Merge branch ↵Clement Ho2017-08-145-53/+68
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34527-make-edit-comment-button-always-available-outside-of-dropdown' into 'master' Resolve "Make edit comment button always available outside of dropdown" Closes #34527 See merge request !12931
| * | | | | | take edit note button out of dropdown34527-make-edit-comment-button-always-available-outside-of-dropdownSimon Knox2017-08-105-53/+68
| | | | | | |
* | | | | | | Merge branch '7-days-cycle-analytics' into 'master'Rémy Coutable2017-08-142-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `Last 7 days` option for Cycle Analytics view Closes #36300 See merge request !13443
| * | | | | | | Add a `Last 7 days` option for Cycle Analytics viewMehdi Lahmam2017-08-112-1/+11
| | | | | | | |
* | | | | | | | Merge branch 'rs-remove-username-from-sanitize-attrs' into 'master'Rémy Coutable2017-08-141-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `username` from `User#sanitize_attrs` callback See merge request !13511
| * | | | | | | | Remove `username` from `User#sanitize_attrs` callbackrs-remove-username-from-sanitize-attrsRobert Speicher2017-08-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This attribute is since validated against `DynamicPathValidator`, which has strict requirements for the characters allowed, and should no longer need to be sanitized in a callback before saving. This has additional benefits in our test suite, where every creation of a `User` record was calling `Sanitize.clean` on a username value that was always clean, since we're the ones generating it.
* | | | | | | | | Merge branch '36089-handle-ref-failure-better' into 'master'Douwe Maan2017-08-144-16/+31
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor how we fetch ref for merge requests Closes #36089 and #36296 See merge request !13416
| * | | | | | | | Use with_repo_branch_commit instead of fetch_ref directlyLin Jen-Shin2017-08-141-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that we could limit the access to Repository#fetch_ref See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13416#note_37487433
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-08-1440-116/+661
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36089-handle-ref-failure-better * upstream/master: (47 commits) Update CHANGELOG.md for 9.4.5 Update charlock_holmes add a changelog entry switch to multi-line before block restructure the #new_key notification spec don't send devise notifications to the ghost user reset_delivered_emails before testing #new_key skip the :read_project check for new_project_member move the member spec to be with the other ones add a spec for new_group_member add a spec for never emailing the ghost user rubocop fix a membership with no user is always notifiable check notifiability for more emails add Member#notifiable?(type, opts) make NotificationRecipient a little more customizable Add notes about database performance for MySQL fix confidential border issue as well as confidential styles leaking on new MR Migrate force push check to Gitaly Add option to disable project export on instance ...
| * | | | | | | | | Since now fetch_ref is reliable, we could just rely on itLin Jen-Shin2017-08-111-5/+5
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-08-1146-191/+164
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36089-handle-ref-failure-better * upstream/master: (62 commits) Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb. Docs: update user docs index Fix minor typos in views Fix Layout/SpaceBeforeBlockBraces violation in bin/changelog_spec Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4' Merge branch 'import-symlinks-9-3' into 'security-9-3' Fix wrong method call on prometheus histogram Document new all-in-one Helm chart - docs Fix 404 on link path Fix line numbers not matching up to code in code viewer. Hide overflow-x on collapsed sidebar removed global use of breakpoint checker Increase performance of the breakpoint size checker Filter sensitive query string parameters from NGINX access logs Added a template for database changes Render new issue link in failed job as a regular link instead of a UJS one Include RE2 in the upgrade docs Remove affix plugin from issuable sidebar with new navigation Fix linter error alternative route for download archive ...
| * | | | | | | | | | Don't try to create diffs if one of the branch is missingLin Jen-Shin2017-08-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix a few tests
| * | | | | | | | | | Introduce MergeRequest#write_ref and Repository#write_refLin Jen-Shin2017-08-103-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so that we don't have to fetch it for non-forks
| * | | | | | | | | | Avoid ambiguity, which happened in a single test runLin Jen-Shin2017-08-101-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Just detect exit status rather than check refLin Jen-Shin2017-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13416#note_37193731 So we just try a cheaper way to detect it if it works or not
| * | | | | | | | | | Fix some tests and report the error messageLin Jen-Shin2017-08-091-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Detect if we didn't create the ref soonerLin Jen-Shin2017-08-091-1/+4
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'pagination-projects-explore' into 'master'Douwe Maan2017-08-144-5/+37
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Prev/Next pagination for exploring projects Closes #27390 See merge request !13456
| * | | | | | | | | | Use Prev/Next pagination for exploring projectspagination-projects-exploreYorick Peterse2017-08-144-5/+37
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the pagination of the "Explore" pages so they use a simpler pagination system that only shows "Prev" and "Next" buttons. This removes the need for getting the total number of rows to display, a process that can easily take up to 2 seconds when browsing through a large list of projects. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/27390
* | | | | | | | | | Merge branch 'fly-out-tunnel' into 'master'Filipa Lacerda2017-08-142-41/+128
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dynamic navigation tunnel to fly-out menus Closes #35949 See merge request !13315