delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed eslint test failureeslint-fix	Phil Hughes	2017-02-03	1	-2/+2
\|
*	Merge branch 'Add-a-shash-command-for-target-merge-request-branch' into 'master'	Sean McGivern	2017-02-03	5	-0/+123
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Adds /target_branch slash command functionality for merge requests Closes #23619 See merge request !7216
\| *	Adds /target_branch slash command functionality for merge requests	YarNayar	2017-02-03	5	-0/+123
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 McGivern	2017-02-03	2	-3/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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 Ferreira	2017-02-03	2	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Dashboard::ProjectsController#index
* \| \|	Merge branch '25460-replace-word-users-with-members' into 'master'	Clement Ho	2017-02-03	3	-5/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	replace words user(s) with member(s) Closes #25460 See merge request !8872
\| * \| \|	adds changelog25460-replace-word-users-with-members	Nur Rony	2017-01-30	1	-0/+4
\| \| \| \|
\| * \| \|	replace words user(s) with member(s)	Nur Rony	2017-01-30	2	-5/+5
\| \| \|/ \| \|/\|
* \| \|	Merge branch ↵	Annabel Dunstone Gray	2017-02-03	2	-1/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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-safari	samrose3	2017-02-01	2	-1/+6
\| \| \| \|
* \| \| \|	Merge branch '17662-rename-builds' into 'master'	Kamil Trzciński	2017-02-03	56	-220/+224
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Rename "Builds" to "Pipelines", "CI/CD Pipelines", or "Jobs" everywhere" Closes #17662 See merge request !8787
\| * \| \| \|	Fix broken tests17662-rename-builds	Filipa Lacerda	2017-02-03	44	-175/+175
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 entry	Filipa Lacerda	2017-02-03	12	-26/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace "builds" in project settings Replace "builds" in admin area
\| * \| \| \|	Change "Build" to "Job" in builds show page header and sidebar	Filipa Lacerda	2017-02-03	7	-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 Schatz	2017-02-03	4	-10/+34
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improved ref switcher dropdown performance Closes #18202 See merge request !7239
\| * \| \| \| \|	Fixed protected branches dropdownref-switcher-perf	Phil Hughes	2016-11-21	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed up tests	Phil Hughes	2016-11-21	2	-3/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed the active branch selected indicator	Phil Hughes	2016-11-21	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Changed how the data is returned - we only care about the branch/tag name	Phil Hughes	2016-11-21	2	-4/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Uses take rather than Kaminari	Phil Hughes	2016-11-21	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Use cloneNode instead of createElement	Phil Hughes	2016-11-21	1	-5/+13
\| \| \| \| \| \|
\| * \| \| \| \|	Improved ref switcher dropdown performance	Phil Hughes	2016-11-21	2	-7/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #18202
* \| \| \| \| \|	Merge branch 'markdown-plantuml' into 'master'	Sean McGivern	2017-02-03	9	-8/+115
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PlantUML support for Markdown Closes #4048 See merge request !8588
\| * \| \| \| \| \|	PlantUML support for Markdown	Horacio Sanson	2017-02-03	9	-8/+115
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow rendering of PlantUML diagrams in Markdown documents using fenced blocks: ```plantuml Bob -> Sara : Hello Sara -> Bob : Go away ``` Closes: #4048
* \| \| \| \| \| \|	Merge branch 'squash' into 'master'	Sean McGivern	2017-02-03	13	-28/+75
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport changes from EE squash See merge request !8912
\| * \| \| \| \| \| \|	Backport changes from EE squash	Sean McGivern	2017-02-03	13	-28/+75
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 Zaporozhets	2017-02-03	22	-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 Pahlevi	2017-02-03	22	-32/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add complete changelog for !8949
* \| \| \| \| \| \| \|	Merge branch '24606-force-password-reset-on-next-login' into 'master'	Sean McGivern	2017-02-03	4	-0/+14
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Force new password after password reset via API Closes #24606 See merge request !8933
\| * \| \| \| \| \| \|	Update api docs and minor changes	George Andrinopoulos	2017-02-02	2	-2/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Force new password after password reset via API	George Andrinopoulos	2017-02-02	3	-0/+12
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'update-installation-docs' into 'master'	Stan Hu	2017-02-03	2	-0/+139
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update installation docs to include Docker, others See merge request !8943
\| * \| \| \| \| \| \|	Update installation docs to include Docker, othersupdate-installation-docs	Cindy Pallares	2017-02-02	2	-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 Maan	2017-02-02	41	-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-file	Lin Jen-Shin	2017-02-02	426	-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 request	Lin Jen-Shin	2017-01-26	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_21626479
\| * \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-01-26	157	-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 explicitly	Lin Jen-Shin	2017-01-26	1	-6/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_21627134
\| * \| \| \| \| \| \| \| \| \|	We don't care about the return value now	Lin Jen-Shin	2017-01-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Make GitHooksService#execute return block value	Lin Jen-Shin	2017-01-26	2	-8/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_21627207
\| * \| \| \| \| \| \| \| \| \|	Use commit rather than branch, and rename to avoid confusion	Lin Jen-Shin	2017-01-26	1	-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 used	Lin Jen-Shin	2017-01-26	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_21626434
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-01-26	1415	-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 renaming	Lin Jen-Shin	2017-01-07	6	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Rename from base to start because base could mean merge base	Lin Jen-Shin	2017-01-06	11	-91/+91
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Detect if we really want a new merge request properly	Lin Jen-Shin	2017-01-06	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Properly fix the edge case!	Lin Jen-Shin	2017-01-06	1	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Rename source to base to avoid confusion from MR	Lin Jen-Shin	2017-01-06	11	-91/+91
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Don't set invalid @mr_source_branch when create_merge_request?	Lin Jen-Shin	2017-01-06	1	-6/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Prefer leading dots over trailing dots	Lin Jen-Shin	2017-01-06	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|