summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fixed eslint test failureeslint-fixPhil Hughes2017-02-031-2/+2
|
* Merge branch 'Add-a-shash-command-for-target-merge-request-branch' into 'master'Sean McGivern2017-02-031-0/+12
|\ | | | | | | | | | | | | Adds /target_branch slash command functionality for merge requests Closes #23619 See merge request !7216
| * Adds /target_branch slash command functionality for merge requestsYarNayar2017-02-031-0/+12
| | | | | | | | | | | | | | Allows to use slash command /target_branch <target_branch_name> in merge requests notes and description. Command allows to specify target branch for current merge request. Proposed in #23619
* | Merge branch ↵Sean McGivern2017-02-031-3/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | '27267-unnecessary-queries-from-projects-dashboard-atom-and-json' into 'master' Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index Closes #27267 See merge request !8956
| * | Remove unnecessary queries for .atom and .json in ↵Oswaldo Ferreira2017-02-031-3/+1
| | | | | | | | | | | | Dashboard::ProjectsController#index
* | | Merge branch '25460-replace-word-users-with-members' into 'master' Clement Ho2017-02-032-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | replace words user(s) with member(s) Closes #25460 See merge request !8872
| * | | replace words user(s) with member(s)Nur Rony2017-01-302-5/+5
| | |/ | |/|
* | | Merge branch ↵Annabel Dunstone Gray2017-02-031-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '27332-mini-pipeline-graph-with-many-stages-has-no-line-spacing-in-firefox-and-safari' into 'master' Resolve "Mini pipeline graph with many stages has no line spacing in Firefox and Safari" Closes #27332 See merge request !8886
| * | | Adjust pipeline graph height so they don't touch27332-mini-pipeline-graph-with-many-stages-has-no-line-spacing-in-firefox-and-safarisamrose32017-02-011-1/+2
| | | |
* | | | Merge branch '17662-rename-builds' into 'master' Kamil Trzciński2017-02-0341-89/+89
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Rename "Builds" to "Pipelines", "CI/CD Pipelines", or "Jobs" everywhere" Closes #17662 See merge request !8787
| * | | | Fix broken tests17662-rename-buildsFilipa Lacerda2017-02-0330-44/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Build to Job Replace "Builds" by "Jobs" and fix broken specs Replace "Builds" by "Jobs" Fix broken spinach test Fix broken test Remove `˙` at the beginning of the file Fix broken spinach test Fix broken tests Changes after review
| * | | | Adds changelog entryFilipa Lacerda2017-02-0311-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace "builds" in project settings Replace "builds" in admin area
| * | | | Change "Build" to "Job" in builds show page header and sidebarFilipa Lacerda2017-02-037-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change "Builds" to "Job" in Builds table Change "Get started with Builds" to "Get started with CI/CD Pipelines" in builds list view Change "Build" to "Jobs" in builds show view
* | | | | Merge branch 'ref-switcher-perf' into 'master' Jacob Schatz2017-02-033-8/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved ref switcher dropdown performance Closes #18202 See merge request !7239
| * | | | | Fixed protected branches dropdownref-switcher-perfPhil Hughes2016-11-211-1/+1
| | | | | |
| * | | | | Fixed up testsPhil Hughes2016-11-211-1/+1
| | | | | |
| * | | | | Fixed the active branch selected indicatorPhil Hughes2016-11-211-1/+1
| | | | | |
| * | | | | Changed how the data is returned - we only care about the branch/tag namePhil Hughes2016-11-212-4/+5
| | | | | |
| * | | | | Uses take rather than KaminariPhil Hughes2016-11-211-2/+2
| | | | | |
| * | | | | Use cloneNode instead of createElementPhil Hughes2016-11-211-5/+13
| | | | | |
| * | | | | Improved ref switcher dropdown performancePhil Hughes2016-11-212-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | Closes #18202
* | | | | | Merge branch 'squash' into 'master' Sean McGivern2017-02-039-22/+58
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes from EE squash See merge request !8912
| * | | | | | Backport changes from EE squashSean McGivern2017-02-039-22/+58
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-038-12/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | 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-038-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | add complete changelog for !8949
* | | | | | Merge branch 'fix-git-hooks-when-creating-file' into 'master' Douwe Maan2017-02-0220-321/+626
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-02121-508/+871
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-263-9/+9
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | 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-26606-3259/+9044
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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-062-5/+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-053-10/+23
| | | | | | | | | |
| * | | | | | | | | 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
View Lorry Controller Status