summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Introduce maximum session time for terminal websocket connectionterminal-max-session-timeAdam Niedzielski2017-02-062-2/+16
| | | | | Store the value in application settings. Expose the value to Workhorse.
* Remove backlog lists from boardsDouglas Barbosa Alexandre2017-02-032-5/+1
|
* Merge branch 'squash' into 'master' Sean McGivern2017-02-031-2/+2
|\ | | | | | | | | Backport changes from EE squash See merge request !8912
| * Backport changes from EE squashSean McGivern2017-02-031-2/+2
| | | | | | | | | | | | | | Backport changes from the EE-only squash implementation, which would otherwise conflict when merge CE into EE. <https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1024>
* | Merge branch 'fwn-to-find-by-full-path' into 'master' Dmitriy Zaporozhets2017-02-031-5/+1
|\ \ | |/ |/| | | | | replace `find_with_namespace` with `find_by_full_path` See merge request !8949
| * replace `find_with_namespace` with `find_by_full_path`Adam Pahlevi2017-02-031-5/+1
| | | | | | | | add complete changelog for !8949
* | Merge branch 'fix-git-hooks-when-creating-file' into 'master' Douwe Maan2017-02-022-221/+275
|\ \ | | | | | | | | | | | | | | | | | | Don't execute git hooks if you create branch as part of other change Closes #23439 See merge request !7237
| * \ Merge remote-tracking branch 'upstream/master' into ↵fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-0211-82/+113
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (190 commits) Remove unnecessary returns / unset variables from the CoffeeScript -> JS conversion. update spec Change the reply shortcut to focus the field even without a selection. use destroy_all Remove settings cog from within admin scroll tabs; keep links centered add changelog remove old project members from project add spec replicating validation error Fix small typo on new branch button spec Improve styling of the new issue message Don't capitalize environment name in show page Abillity to promote project labels to group labels Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles Update and pin the `jwt` gem to ~> 1.5.6 refactor merge request build service Update index.md Clarify that Auto Deploy requires a public project. 19164 Add settings dropdown to mobile screens cop for gem fetched from a git source Add CHANGELOG entry ...
| * \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-01-261-4/+4
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: Ensure we have a project with a repo in GitlabMarkdownHelper specs Revert "Make sure TraceReader uses Encoding.default_external" Make sure TraceReader uses Encoding.default_external Update CONTRIBUTING.md after merging "up-for-grabs" and "Accepting Merge Requests" [ci skip] Use `:empty_project` where possible in finder specs Use `empty_project` where possible in controller specs Use `:empty_project` where possible in helper specs Don’t count tasks that are not defined as list items correctly Use a project factory with a repository where necessary Use `:empty_project` where possible throughout spec/lib Use hashrocket for dasherized attribute Remove markdown file extension and add anchor to link Fixed builds info link on project settings page Factories with a project association use `:empty_project` by default Update enviroments.md the example for deleting an environment is missing the "s" in environments. curl --request DELETE --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/environments/1" wil 404
| * | | Use commit rather than branch, and rename to avoid confusionLin Jen-Shin2017-01-261-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_21626953 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_21626952
| * | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-01-2681-427/+788
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (1122 commits) Update CHANGELOG.md for 8.16.2 Display project ID in project settings (!8572) fixed points from comments to improve code quality Update CHANGELOG.md for 8.14.8 Statisfy eslint Add CHANGELOG entry Fix access to the wiki code via HTTP when repository feature disabled Display fullscreen button on small screens (!5302) Prevent removing fields from dropdowns on input elements fix for all themes Return struct instead of multiple values Fix race conditions for AuthorizedProjectsWorker Add User#nested_groups and User#nested_projects methods Fix spec failure due to timestamp ordering issue in mySQL Fixed error with filter keyboard tests `can?` already includes the `feature_available?` check Test there is no Merge Request button when MRs are disabled Ensure the correct Merge Request button is found Add 409 conflict tests Add CHANGELOG ...
| * | | | Rename from base to start because base could mean merge baseLin Jen-Shin2017-01-061-39/+39
| | | | |
| * | | | Rename source to base to avoid confusion from MRLin Jen-Shin2017-01-061-39/+39
| | | | |
| * | | | Prefer leading dots over trailing dotsLin Jen-Shin2017-01-061-2/+2
| | | | |
| * | | | Remove tag with git hooksLin Jen-Shin2017-01-051-8/+11
| | | | |
| * | | | Introduce Repository#with_repo_branch_commitLin Jen-Shin2017-01-051-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We merge repository checks inside it so we don't have to check it on the call site, and we could also load the commit for the caller. This greatly reduce code duplication. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_20572919
| * | | | Indent the way rubocop likesLin Jen-Shin2017-01-051-1/+1
| | | | |
| * | | | Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-0462-439/+1168
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (1031 commits) Add changelog entry for renaming API param [ci skip] Add missing milestone parameter Refactor issues filter in API Fix project hooks params Gitlab::LDAP::Person uses LDAP attributes configuration Don't delete files from spec/fixtures Copy, don't move uploaded avatar files Minor improvements to changelog docs Rename logo, apply for Slack too Fix Gemfile.lock for the octokit update Fix cross-project references copy to include the project reference Add logo in public files Use stable icon for Mattermost integration rewrite the item.respond_to?(:x?) && item.x? to item.try(:x?) API: extern_uid is a string Increases pipeline graph drowdown width in order to prevent strange position on chrome on ubuntu Removed bottom padding from merge manually from CLI because of repositioning award emoji's Make haml_lint happy Improve spec Add feature tests for Cycle Analytics ...
| * | | | | Also check blob path from source branchLin Jen-Shin2016-12-141-18/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19747244
| * | | | | Not sure why, but apparently SHA works betterLin Jen-Shin2016-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's very weird that source_commit.raw_commit and rugged.branches[merge_request.target_branch].target should be completely the same. I checked with == and other values which proved that both should be the same, but still tests cannot pass for: spec/services/merge_requests/refresh_service_spec.rb I decided to give it up. We could just use SHA and that works fine anyway.
| * | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-1012-141/+226
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (60 commits) Refactor SSH keys docs Improvements to setting up ssh Do not reload diff for merge request made from fork when target branch in fork is updated Add 8.12.10, 8.12.11, and 8.12.12 CHANGELOG.md items Changes after review Fix broken test Adds CHANGELOG entry Adds tests Uniformize props name format Replace commit icon svg logic Replace play icon svg logic Update docs to reflect new defaults on omnibus Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security' Merge branch 'html-safe-diff-line-content' into 'security' Merge branch 'rs-filter-authentication_token' into 'security' Merge branch 'destroy-session' into 'security' remove unnecessary issues event filter on comments tab Updating reference to database password Add CHANGELOG entry Displays milestone remaining days only when it's present ...
| * | | | | | Pass source_commit so that we save a few lookupsLin Jen-Shin2016-12-101-33/+18
| | | | | | |
| * | | | | | Use rugged.references.delete to delete referenceLin Jen-Shin2016-12-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19746468
| * | | | | | Introduce git_action and normalize previous_pathLin Jen-Shin2016-12-091-26/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19747456
| * | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-0819-97/+119
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (116 commits) adds impersonator variable and makes sudo usage overall more clear Reenables /user API request to return private-token if user is admin and requested with sudo Fix Backup::Manager#remove_old Allow public access to some Tag API endpoints Update outdated visible content spec descriptions Grapify the issues API new DevOps report, 404s, typos Remove dashboard.scss Update custom_hooks.md for global custom hooks and chained hook info Move admin hooks spinach to rspec Move admin logs spinach test to rspec Fix 404 error when visit group label edit page A simpler implementation of finding a merge request Encourage bug reporters to mention if they use GitLab.com [ci skip] Bump gitlab-shell version to 4.0.3 Remove confirmation.scss Explain "js: true" in "deleted_source_branch_spec.rb" [ci skip] Move award emojis to framwork Move image styles to framework Remove tags.scss ...
| * | | | | | | Introduce Repository#with_tmp_ref which we needLin Jen-Shin2016-12-082-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commits from the other repository. We'll cleanup the tmp ref after we're done with our business.
| * | | | | | | Cleanup parameters, easier to understand andLin Jen-Shin2016-12-081-43/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more consistent across different methodst
| * | | | | | | find the commit properly and replicate gitlab_gitLin Jen-Shin2016-12-081-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by checking filename as well
| * | | | | | | Spaces around hash bracesLin Jen-Shin2016-12-081-9/+9
| | | | | | | |
| * | | | | | | We need to normalize the path for all actionsLin Jen-Shin2016-12-081-4/+6
| | | | | | | |
| * | | | | | | Use branch_name to find the branch rather than refLin Jen-Shin2016-12-081-2/+2
| | | | | | | |
| * | | | | | | Restore the check for update in commit_fileLin Jen-Shin2016-12-081-0/+8
| | | | | | | |
| * | | | | | | Use commit_file for commit_dirLin Jen-Shin2016-12-081-14/+24
| | | | | | | |
| * | | | | | | Use multi_action to commit which doesn't need toLin Jen-Shin2016-12-071-63/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | have the branch existed upfront. That is, `Rugged::Commit.create` rather than `Gitlab::Git::Blob.commit` which the former doesn't need to have the branch but the latter needs.
| * | | | | | | Not sure why rubocop prefers this but anywayLin Jen-Shin2016-12-071-2/+2
| | | | | | | |
| * | | | | | | Commit outside the hooks if possible:Lin Jen-Shin2016-12-071-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So we still commit outside the hooks, and only update ref inside the hooks. There are only two exceptions: * Whenever it's adding a tag. We can't add a tag without committing, unfortunately. See !7700 * Whenever source project is in another repository. We'll need to fetch ref otherwise commits can't be made. See the whole discussion starting from: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19210942
| * | | | | | | Pass source_branch properly for cherry-pick/revertLin Jen-Shin2016-12-071-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237/diffs#note_19210818
| * | | | | | | Introduce GitOperationService and wrap everyLin Jen-Shin2016-12-061-151/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git operation inside GitHooksService. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19210942 TODO: Fix tests for update_branch_with_hooks
| * | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-0319-182/+126
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (288 commits) Added a changelog entry WIP: Adds a default commit message when adding a README (#25167) Change prop name to keep consistency with other props. Adds changelog entry Change ref property to commitRef Test all values for `enabled_git_access_protocol` Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClass Simplify `branch_name` in bin/changelog Speed up project snippet security request specs Remove change to MWBS in code review guideline Enable ColorVariable in scss-lint Clean up common_utils.js (!7318) 24726 Remove Across GitLab from side navigation Remove source sans pro Use system font Update CHANGELOG.md for 8.14.2 Don't allow to specify a repo or version when installing Workhorse Fixed row margins on Pipeline Settings page in order to unify styles Fix URL rewritting in the Help section Allow public access to some Project API endpoints ...
| * | | | | | | | Add some explanation to Repository#update_branch_with_hooksLin Jen-Shin2016-11-251-2/+5
| | | | | | | | |
| * | | | | | | | Fix local name from branch to branch_nameLin Jen-Shin2016-11-241-1/+1
| | | | | | | | |
| * | | | | | | | Should also pass source_commit to raw_ensure_branchLin Jen-Shin2016-11-241-0/+1
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-11-2414-166/+116
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (141 commits) Log mv_namespace parameters Remove header ids from University docs Added test that checks the correct select box is there for the LFS enabled setting. Simplify copy on "Create a new list" dropdown in Issue Boards Fix `LFS enabled` select box. Use Commit#author so we share logic and cache Move admin abuse report spinach test to rspec fixes non-retina shadow and browser zoom issue Use default `closest` if available! Adds polyfill for CustomEvent Move abuse report spinach test to rspec Add support of Chrome/Chromium in requirements.md Fixed dragging issues on issue boards Grapify the sidekiq metrics API Add nested groups support to the routing Correctly determine mergeability of MR with no discussions API: Add endpoint to delete a group share Add a starting date to milestones Update ProjectTeam#fetch_members to use project authorizations Update ProjectTeam#max_member_access_for_user_ids to use project authorizations ...
| * | | | | | | | | Move all branch creation to raw_ensure_branch,Lin Jen-Shin2016-11-222-31/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and keep it only called in update_branch_with_hooks.
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-11-2232-522/+843
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (657 commits) Use single quote for strings Ue svg from SVGs object Dont trigger CI builds [ci skip] Revert "Test only migrations" Add custom copy for each empty stage Fetch only one revision Highlight nav item on hover Test only migrations Fix migration paths tests Scroll CA stage panel on mobile Fix CSS declaration administer to administrator Move SVGs to JS objects for easy reuse Improve deploy command message No enough data to Not enough data Keep the cookie name as before Fix variable usage Evalute time_ago method instead of printing it Removed button styling from restricted visibility levels and added checkboxes with icons Do not show overview message if there’s already CA data ...
| * | | | | | | | | | Add a few comments to explain implementation detailLin Jen-Shin2016-11-151-0/+2
| | | | | | | | | | |
| * | | | | | | | | | Make sure we have the branch on the other projectLin Jen-Shin2016-11-151-0/+11
| | | | | | | | | | |
| * | | | | | | | | | Branch could be nil if it's an empty repoLin Jen-Shin2016-11-151-4/+9
| | | | | | | | | | |
| * | | | | | | | | | Add missing space due to Sublime TextLin Jen-Shin2016-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's Sublime Text's fault. Its word wrapping is not code friendly
| * | | | | | | | | | Make sure we create target branch for cherry/revertLin Jen-Shin2016-11-151-7/+10
| | | | | | | | | | |