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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Limit level of nesting for groupsdz-limit-nested-groups	Dmitriy Zaporozhets	2017-02-08	1	-11/+22
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'ee-1439-read-only-user' into 'master'	Douwe Maan	2017-02-07	1	-0/+33
\|\ \| \| \| \| \| \| \| \|	Backport changes from gitlab-org/gitlab-ee!998 See merge request !8984
\| *	More backport	Douwe Maan	2017-02-06	1	-0/+33
\| \|
* \|	Update spec	Douwe Maan	2017-02-06	1	-2/+2
\| \|
* \|	Merge branch 'jej-pages-to-ce' into 'master'	Douwe Maan	2017-02-06	2	-0/+212
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding GitLab Pages to CE Closes #14605, gitlab-com/infrastructure#1058, gitlab-ee#1333, and #323 See merge request !8463
\| * \	Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ce	James Edwards-Jones	2017-02-06	4	-53/+34
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \ \	Merge branch 'master' into jej-pages-picked-from-ee	James Edwards-Jones	2017-02-03	9	-138/+243
\| \|\ \ \
\| * \| \| \|	Update validates_hostname to 1.0.6 to fix a bug in parsing ↵	Nick Thomas	2017-02-01	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	hexadecimal-looking domain names
\| * \| \| \|	Fix Rubocop offenses	Grzegorz Bizon	2017-02-01	1	-7/+7
\| \| \| \| \|
\| * \| \| \|	Mock Dir::exist? in project_spec.rb	Kamil Trzcinski	2017-01-31	1	-2/+1
\| \| \| \| \|
\| * \| \| \|	Introduce pages_deployed? to Project model	Kamil Trzcinski	2017-01-31	1	-6/+17
\| \| \| \| \|
\| * \| \| \|	Describe #pages_url instead of :pages_url	Kamil Trzcinski	2017-01-31	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Fix the URL of group pages	Kamil Trzcinski	2017-01-31	1	-0/+33
\| \| \| \| \|
\| * \| \| \|	Update comments	Kamil Trzcinski	2017-01-31	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	Verify trusted certificate chain	Kamil Trzcinski	2017-01-31	1	-4/+10
\| \| \| \| \|
\| * \| \| \|	Pages domain model specs	Kamil Trzcinski	2017-01-31	2	-0/+153
\| \| \| \| \|
* \| \| \| \|	Merge branch 'traits-for-featurs' into 'master'	Robert Speicher	2017-02-06	5	-7/+3
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add traits for ProjectFeatures to Project factory Closes #24007 See merge request !8925
\| * \| \| \|	Add traits for ProjectFeatures to Project factory	Semyon Pupkov	2017-02-05	5	-7/+3
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/24007
* \| \| \|	Introduce maximum session time for terminal websocket connectionterminal-max-session-time	Adam Niedzielski	2017-02-06	1	-2/+14
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Store the value in application settings. Expose the value to Workhorse.
* \| \|	Merge branch 'rs-event-traits' into 'master'	Rémy Coutable	2017-02-03	2	-16/+16
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add traits for the different Event types to the Event factory See merge request !8870
\| * \| \|	Add traits for the different Event types to the Event factoryrs-event-traits	Robert Speicher	2017-02-01	2	-16/+16
\| \| \| \|
* \| \| \|	Merge branch 'add-issues-to-boards' into 'master'	Fatih Acet	2017-02-03	1	-35/+4
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add issues to boards list Closes #26205 See merge request !8737
\| * \| \|	Remove backlog lists from boards	Douglas Barbosa Alexandre	2017-02-03	1	-35/+4
\| \| \| \|
* \| \| \|	Merge branch '17662-rename-builds' into 'master'	Kamil Trzciński	2017-02-03	1	-2/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \|	Backport changes from EE squash	Sean McGivern	2017-02-03	1	-3/+11
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'fix-git-hooks-when-creating-file' into 'master'	Douwe Maan	2017-02-02	3	-58/+138
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	65	-158/+279
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-Shin	2017-01-26	2	-2/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \ \ \	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-01-26	42	-1800/+2756
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Remove tag with git hooks	Lin Jen-Shin	2017-01-05	1	-2/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into fix-git-hooks-when-creating-file	Lin Jen-Shin	2017-01-04	43	-673/+1607
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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 ...
\| * \| \| \| \| \|	Unify parameters and callback after hooks	Lin Jen-Shin	2016-12-14	1	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19747856
\| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2016-12-10	10	-129/+298
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 lookups	Lin Jen-Shin	2016-12-10	1	-5/+23
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2016-12-08	18	-72/+316
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 ...
\| * \| \| \| \| \| \| \|	Fix tests to use the new API	Lin Jen-Shin	2016-12-08	2	-5/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Cleanup parameters, easier to understand and	Lin Jen-Shin	2016-12-08	1	-28/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	more consistent across different methodst
\| * \| \| \| \| \| \| \|	Commit outside the hooks if possible:	Lin Jen-Shin	2016-12-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \|	Re-enable tests for update_branch_with_hooks and	Lin Jen-Shin	2016-12-06	1	-12/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add back check if we're losing commits in a merge.
\| * \| \| \| \| \| \| \|	Introduce GitOperationService and wrap every	Lin Jen-Shin	2016-12-06	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 branch '20248-add-coverage-regex-in-job-yaml' into 'master'	Douwe Maan	2017-02-02	1	-0/+41
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ability to define a coverage regex in the .gitlab-ci.yml Closes #20428 See merge request !7447
\| * \| \| \| \| \| \| \| \|	Make more code improvements around the '/' stripping logic	Leandro Camargo	2017-01-25	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Force coverage value to always be surrounded by '/'	Leandro Camargo	2017-01-25	1	-4/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Improve specs styles/organization and add some more specs	Leandro Camargo	2017-01-25	1	-6/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Comply to more requirements and requests made in the code review	Leandro Camargo	2017-01-25	1	-3/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Simplify coverage setting and comply to some requests in code review	Leandro Camargo	2017-01-25	1	-3/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add specs to cover the implemented feature and fix a small bug	Leandro Camargo	2017-01-25	1	-0/+33
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-depr-warn' into 'master'	Rémy Coutable	2017-02-02	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	resolve deprecation warnings Closes #27423 See merge request !8855