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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'sh-headless-chrome-support' into 'master'	Stan Hu	2017-11-03	2	-0/+83
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Replace PhantomJS with Headless Chrome for GitLab Integration Tests Closes #30876 See merge request gitlab-org/gitlab-ce!12244
\| *	Merge branch 'master' into sh-headless-chrome-support	Mike Greiling	2017-11-03	2	-2/+4
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (33 commits) Ignore SQL CACHE hits in Sherlock Fix SQL timings for the performance bar Find the LFS-objects for a fork within a the fork network Remove bottom-border from last responsive table row Add system hooks user_rename and group_rename Unlink a project from a fork network when it's source was deleted. Make sure the settings page renders when root of a fork is deleted Remove Peek's original keyboard shortcut (numpad 0, keycode 96) Add application setting to Auto DevOps docs Enable MergeableSelector in scss-lint (for !14567) Enable MergeableSelector in scss-lint (for !14055) Enable MergeableSelector in scss-lint (for !14062) Enable MergeableSelector in scss-lint (for !14398) Enable MergeableSelector in scss-lint (for !13480) Enable MergeableSelector in scss-lint (for !13473) Enable MergeableSelector in scss-lint (for !13600) Enable MergeableSelector in scss-lint Resolve ""To do" should be "Todos" on Todos list page" Avoid regenerating the ref path for the environment Remove white space at bottom of issue boards ...
\| * \	Merge branch 'master' into sh-headless-chrome-support	Mike Greiling	2017-11-02	33	-80/+332
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (109 commits) Remove Filesystem check metrics that use too much CPU to handle requests Set merge_request_diff_id on MR when creating Add a column linking an MR to its diff Remove useless closeReopenReport specs Clarify external artifacts only working when GitLab pages is enabled Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when the memory killer kicks in Remove an exception from the git user default SSH config check Geo route whitelisting is too optimistic Update .nvmrc to current stable (v9.0.0) Update documentation Address Douwe's feedback Refactor responsive table styles to support nested error block Add changelog items Update specs for sudo behavior Move RSS and incoming email tokens from User Settings > Accounts to User Settings > Access Tokens Remove user authentication_token column Migrate user private tokens to personal access tokens Add sudo API scope Consistently use PersonalAccessToken instead of PersonalToken Remove User#private_token ...
\| * \| \|	fix bracket styling	Mike Greiling	2017-11-02	1	-5/+5
\| \| \| \|
\| * \| \|	Merge branch 'master' into sh-headless-chrome-support	Mike Greiling	2017-10-31	8	-22/+140
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (84 commits) Migrate Gitlab::Git::Wiki#page to Gitaly Load participants async Normalize LDAP DN when looking up identity Improve the maintenance policy page add changelog fix spec failure Allow promoting project milestones to group milestones fix specs Be able to bundle gems with newer rubies Upgrade Ruby to 2.3.5 fixed up upload feature after master merge fix missing issue assignees Migrate Gitlab::Git::Wiki#delete_page to Gitaly Enable eslint Make `#hashed_storage?` require feature argument Adds callback function to inital cluster request Fix example typo. Upload files through the multi-file editor get branch name from the DOM Resolve "Convert autosize.js library to be a Yarn managed library" ...
\| * \| \| \|	allow inspect_request to inject request headers in order to test Sendfile ↵	Mike Greiling	2017-10-30	1	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	requests in jobs_spec.rb
\| * \| \| \|	Merge branch 'master' into sh-headless-chrome-support	Mike Greiling	2017-10-29	18	-43/+130
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (96 commits) Fetch the merged branches at once Merging EE doc into CE Avoid using Rugged in Gitlab::Git::Wiki#preview_slug Cache commits on the repository model Remove groups_select from global namespace & simplifies the code Change default disabled merge request widget message to "Merge is not allowed yet" Semi-linear history merge is now available in CE. Remove repetitive karma spec Improve spec to check hidden component Rename to shouldShowUsername Add KubernetesService#default_namespace tests Revert "Merge branch '36670-remove-edit-form' into 'master'" Fix bitbucket login Remove duped tests Add path attribute to WikiFile class Make local_branches OPT_OUT Clarify the language around External Group membership with SAML SSO to clarify that this will NOT add users to GitLab Groups. Added ssh fingerprint, gitlab ci and pages information in an instance configuration page Fix the incorrect value being used to set GL_USERNAME on hooks Resolve "Remove overzealous tooltips in projects page tabs" ...
\| * \| \| \| \|	slow down requests for dropzone uploads to avoid race conditions	Mike Greiling	2017-10-24	1	-0/+12
\| \| \| \| \| \|
\| * \| \| \| \|	fix rubocop violations	Mike Greiling	2017-10-24	1	-6/+9
\| \| \| \| \| \|
\| * \| \| \| \|	add InspectRequests helper	Mike Greiling	2017-10-23	1	-3/+2
\| \| \| \| \| \|
\| * \| \| \| \|	implement basic request inspector for use in Capybara tests	Mike Greiling	2017-10-23	1	-0/+59
\| \| \| \| \| \|
* \| \| \| \| \|	Fix Gitlab::Metrics::System#real_time and #monotonic_time doc	Rémy Coutable	2017-11-03	1	-2/+2
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	Merge branch 'sherlock-ignore-cache' into 'master'	Rémy Coutable	2017-11-03	1	-1/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore SQL CACHE hits in Sherlock See merge request gitlab-org/gitlab-ce!15182
\| * \| \| \| \|	Ignore SQL CACHE hits in Sherlocksherlock-ignore-cache	Yorick Peterse	2017-11-03	1	-1/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'performance-bar-sql-timings' into 'master'	Rémy Coutable	2017-11-03	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix SQL timings for the performance bar See merge request gitlab-org/gitlab-ce!15181
\| * \| \| \| \|	Fix SQL timings for the performance bar	Yorick Peterse	2017-11-03	1	-1/+1
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	My recent change accidentally changed the reported time from milliseconds to seconds, resulting in wrong timings being displayed.
* \| \| \| \|	Merge branch '37631-add-a-merge_request_diff_id-column-to-merge_requests' ↵	Yorick Peterse	2017-11-02	1	-0/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Add a `merge_request_diff_id` column to `merge_requests`" See merge request gitlab-org/gitlab-ce!15035
\| * \| \| \|	Set merge_request_diff_id on MR when creating	Sean McGivern	2017-11-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Once we migrate existing MRs to have this column, we will be able to get the latest diff for a single merge request more efficiently, and (more importantly) get all latest diffs for a collection of MRs efficiently.
\| * \| \| \|	Add a column linking an MR to its diff	Sean McGivern	2017-11-02	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We already had this the other way around (merge_request_diffs.merge_request_id), but this is needed to gather only the most recent diffs for a set of merge requests.
* \| \| \| \|	Merge branch 'gitaly-ff-merge' into 'master'	Rémy Coutable	2017-11-02	3	-9/+42
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Incorporate Gitaly's OperationService.UserFFBranch RPC Closes gitaly#693 See merge request gitlab-org/gitlab-ce!15040
\| * \| \| \| \|	Incorporate Gitaly's OperationService.UserFFBranch RPCgitaly-ff-merge	Alejandro Rodríguez	2017-10-31	3	-9/+42
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'icons-ci-icons' into 'master'	Filipa Lacerda	2017-11-02	14	-14/+14
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convert Icons in CI to SVG Sprite Icons See merge request gitlab-org/gitlab-ce!14567
\| * \| \| \| \| \|	Update Action Icons	Tim Zallmann	2017-10-30	5	-5/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Updated also Badge + Dropdown Icons	Tim Zallmann	2017-10-30	9	-9/+9
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'dm-sidekiq-sigstp' into 'master'	Sean McGivern	2017-11-02	1	-14/+27
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when the memory killer kicks in See merge request gitlab-org/gitlab-ce!15102
\| * \| \| \| \| \|	Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when ↵dm-sidekiq-sigstp	Douwe Maan	2017-11-02	1	-14/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the memory killer kicks in
* \| \| \| \| \| \|	Merge branch 'dm-remove-private-token' into 'master'	Sean McGivern	2017-11-02	1	-7/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Private Tokens Closes #38595 and #38447 See merge request gitlab-org/gitlab-ce!14838
\| * \| \| \| \| \| \|	Add sudo API scope	Douwe Maan	2017-11-02	1	-3/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Consistently use PersonalAccessToken instead of PersonalToken	Douwe Maan	2017-11-02	1	-4/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'zj-gitaly-migrate-metrics' into 'master'	Sean McGivern	2017-11-02	1	-1/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Measure Gitaly migration sites against original See merge request gitlab-org/gitlab-ce!15118
\| * \| \| \| \| \| \| \|	Measure Gitaly migration sites against original	Zeger-Jan van de Weg	2017-11-01	1	-1/+5
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We were missing data for Gitaly migration call sites against the original implementation. This commit adds a histogram with a flag telling us if gitaly received the call or the original implementation did.
* \| \| \| \| \| \| \|	Geo route whitelisting is too optimistic	Brett Walker	2017-11-02	1	-2/+3
\| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Fix encoding issue with Repository.ls_files	Kim Carlbäcker	2017-11-02	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'jej/lfs-change-detection' into 'master'	Douwe Maan	2017-11-01	4	-12/+134
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Detect changes to LFS pointers for pruning and integrity check See merge request gitlab-org/gitlab-ce!14785
\| * \| \| \| \| \|	Detect changes to LFS pointers for pruning and integrity check	James Edwards-Jones	2017-11-01	4	-12/+134
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitlab::Git::Blob.batch_lfs_metadata can be used to check for LFS pointers. It uses a lazy enumorator and filters by blob size
* \| \| \| \| \| \|	Merge branch '35914-merge-request-update-worker-is-slow' into 'master'	Sean McGivern	2017-11-01	1	-0/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add metrics tagging to the sidekiq middleware See merge request gitlab-org/gitlab-ce!15111
\| * \| \| \| \| \| \|	reword `targets` to `metric tags`	micael.bergeron	2017-10-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add changelog
\| * \| \| \| \| \| \|	add metrics tagging to the sidekiq middleware	micael.bergeron	2017-10-31	1	-0/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'backport-workhorse-show-all-refs' into 'master'	Douwe Maan	2017-11-01	1	-2/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support show-all-refs for git over HTTP See merge request gitlab-org/gitlab-ce!14834
\| * \| \| \| \| \| \| \|	Support show-all-refs for git over HTTP	Nick Thomas	2017-10-30	1	-2/+3
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '39628-bug-in-the-procedure-advised-from-ee_compat_check' into ↵	Sean McGivern	2017-11-01	1	-11/+13
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Bug in the procedure advised from ee_compat_check" Closes #39628 See merge request gitlab-org/gitlab-ce!15110
\| * \| \| \| \| \| \| \|	Ensure the ee-compat-check uses the correct patch URL for forks39628-bug-in-the-procedure-advised-from-ee_compat_check	Rémy Coutable	2017-10-31	1	-11/+13
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'feature/migrate-find-wiki-file-to-gitaly' into 'master'	Sean McGivern	2017-11-01	3	-5/+65
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Gitlab::Git::Wiki#file to Gitaly Closes gitaly#689 See merge request gitlab-org/gitlab-ce!15014
\| * \| \| \| \| \| \| \|	Migrate Gitlab::Git::Wiki#file to Gitalyfeature/migrate-find-wiki-file-to-gitaly	Ahmad Sherif	2017-10-31	3	-5/+65
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#689
* \| \| \| \| \| \| \|	Merge branch 'go-get-ssh' into 'master'	Douwe Maan	2017-11-01	1	-2/+13
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Returns a SSH url for go-get=1 Closes #38858 See merge request gitlab-org/gitlab-ce!14990
\| * \| \| \| \| \| \|	Returns a ssh url for go-get=1	Guilherme Vieira	2017-10-31	1	-2/+13
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'feature/migrate-find-wiki-page-to-gitaly' into 'master'	Sean McGivern	2017-10-31	3	-7/+82
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Gitlab::Git::Wiki#page to Gitaly Closes gitaly#677 See merge request gitlab-org/gitlab-ce!14955
\| * \| \| \| \| \| \|	Migrate Gitlab::Git::Wiki#page to Gitalyfeature/migrate-find-wiki-page-to-gitaly	Ahmad Sherif	2017-10-31	3	-7/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#677
* \| \| \| \| \| \| \|	Merge branch 'dm-ldap-identity-normalize-dn' into 'master'	Sean McGivern	2017-10-31	2	-3/+4
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Normalize LDAP DN when looking up identity Closes #39559 See merge request gitlab-org/gitlab-ce!15103
\| * \| \| \| \| \| \|	Normalize LDAP DN when looking up identity	Douwe Maan	2017-10-31	2	-3/+4
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|