summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Ensure the right content is served for the build artifacts APIapi-fix-filesRobert Schilling2017-02-052-0/+6
|
* API: Fix file downloadingRobert Schilling2017-02-032-1/+5
|
* Merge branch 'fwn-to-find-by-full-path' into 'master' Dmitriy Zaporozhets2017-02-0322-32/+32
|\ | | | | | | | | 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-0322-32/+32
| | | | | | | | add complete changelog for !8949
* | Merge branch '24606-force-password-reset-on-next-login' into 'master'Sean McGivern2017-02-034-0/+14
|\ \ | | | | | | | | | | | | | | | | | | Force new password after password reset via API Closes #24606 See merge request !8933
| * | Update api docs and minor changesGeorge Andrinopoulos2017-02-022-2/+4
| | |
| * | Force new password after password reset via APIGeorge Andrinopoulos2017-02-023-0/+12
| | |
* | | Merge branch 'update-installation-docs' into 'master' Stan Hu2017-02-032-0/+139
|\ \ \ | | | | | | | | | | | | | | | | Update installation docs to include Docker, others See merge request !8943
| * | | Update installation docs to include Docker, othersupdate-installation-docsCindy Pallares2017-02-022-0/+139
| | | | | | | | | | | | | | | | | | | | | | | | As per this comment https://gitlab.com/gitlab-com/support/issues/374#note_22056587 we're moving documentation around from the support workflows.
* | | | Merge branch 'fix-git-hooks-when-creating-file' into 'master' Douwe Maan2017-02-0241-439/+906
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-02426-2058/+4651
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * | | | | Make sure different project gets a merge requestLin Jen-Shin2017-01-261-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_21626479
| * | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-01-26157-284/+324
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Try to check if branch diverged explicitlyLin Jen-Shin2017-01-261-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_21627134
| * | | | | | We don't care about the return value nowLin Jen-Shin2017-01-261-1/+1
| | | | | | |
| * | | | | | Make GitHooksService#execute return block valueLin Jen-Shin2017-01-262-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_21627207
| * | | | | | 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
| * | | | | | @tree_edit_project is no longer usedLin Jen-Shin2017-01-261-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_21626434
| * | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-01-261415-9306/+37427
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * | | | | | | Fix renamingLin Jen-Shin2017-01-076-9/+9
| | | | | | | |
| * | | | | | | Rename from base to start because base could mean merge baseLin Jen-Shin2017-01-0611-91/+91
| | | | | | | |
| * | | | | | | Detect if we really want a new merge request properlyLin Jen-Shin2017-01-061-2/+5
| | | | | | | |
| * | | | | | | Properly fix the edge case!Lin Jen-Shin2017-01-061-2/+15
| | | | | | | |
| * | | | | | | Rename source to base to avoid confusion from MRLin Jen-Shin2017-01-0611-91/+91
| | | | | | | |
| * | | | | | | Don't set invalid @mr_source_branch when create_merge_request?Lin Jen-Shin2017-01-061-6/+3
| | | | | | | |
| * | | | | | | Prefer leading dots over trailing dotsLin Jen-Shin2017-01-062-4/+4
| | | | | | | |
| * | | | | | | Fix for initial commit and remove unneeded argsLin Jen-Shin2017-01-063-7/+18
| | | | | | | |
| * | | | | | | Just trust set_commit_variables to set everything!Lin Jen-Shin2017-01-063-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing those weird setup in assign_change_commit_vars fixed all the failures in the tests. I still cannot say why but clearly we need to have better names. It's so confusing right now. We should seriously stop fiddling those instance variables.
| * | | | | | | Prefer leading dots over trailing dotsLin Jen-Shin2017-01-052-6/+6
| | | | | | | |
| * | | | | | | Merge request terms are reversed for GitOperationServiceLin Jen-Shin2017-01-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is seriously confusing but a target branch in merge request, is actually the source branch for GitOperationService, which is the base branch. The source branch in a merge request, is the target branch for GitOperationService, which is where we want to make commits. Perhaps we should rename source branch in GitOperationService to base branch, and target branch to committing branch.
| * | | | | | | I think I am really confused, should be @tree_edit_projectLin Jen-Shin2017-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_20571990
| * | | | | | | Remove tag with git hooksLin Jen-Shin2017-01-054-12/+26
| | | | | | | |
| * | | | | | | Introduce Repository#with_repo_branch_commitLin Jen-Shin2017-01-053-33/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-053-5/+5
| | | | | | | |
| * | | | | | | Update the comment:Lin Jen-Shin2017-01-041-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_20876648
| * | | | | | | Prefer leading dots over trailing dotsLin Jen-Shin2017-01-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_20601323
| * | | | | | | Add a comment to explain why newrev should be updatedLin Jen-Shin2017-01-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_20301332
| * | | | | | | Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-041604-8380/+37863
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | | | | | Try to use those @mr variables for full correctnessLin Jen-Shin2016-12-141-4/+6
| | | | | | | | |
| * | | | | | | | Use ArgumentError error instead because it's a bugLin Jen-Shin2016-12-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if it happens. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19747933
| * | | | | | | | Use branch_exists? to check branchesLin Jen-Shin2016-12-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19747922
| * | | | | | | | Unify parameters and callback after hooksLin Jen-Shin2016-12-144-24/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19747856
| * | | | | | | | Use a regular class for GitOperationServiceLin Jen-Shin2016-12-141-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19747793
| * | | | | | | | Fix source_project and also pass source_projectLin Jen-Shin2016-12-146-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19747556
| * | | | | | | | 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
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-1264-130/+888
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: API: Fix groups filter fix: removed signed_out notification Fix typo in curl example request Fix typo Change docs title to represent the edition remove left_align setting from notification setting dropdown in favor of a pure css solution fix alignment for notification settings ajax response [ci skip] Update "Installation from source" guide for 8.15.0 Group links spec update Stop replacing `$your_email` with the user's email Updates the font weight of button styles because of the change to system fonts Updated JS based on review Fixed group links dropdown to match Allow branch names with dots on API endpoint Use a single query in Projects::ProjectMembersController to fetch members Use gitlab-workhose 1.1.1 Updated members dropdowns Use default btn styling for Housekeeping button on projects settings page fix display hook error message API: Endpoint to expose personal snippets as /snippets Removed leave buttons from settings dropdowns
| * | | | | | | | | 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-10173-758/+2004
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * | | | | | | | | | Should pass branch name, not commit object!Lin Jen-Shin2016-12-101-5/+6
| | | | | | | | | | |
| * | | | | | | | | | Pass source_commit so that we save a few lookupsLin Jen-Shin2016-12-103-50/+54
| | | | | | | | | | |