home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,836 Commits 48 Branches 340 Tags
fcb85381cf025da5e8cfecdc1a4afc016b5cb6ae
Commit Graph
1596 Commits
Author SHA1 Message Date
James Lopez fcb85381cf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url 2016-03-28 09:37:55 +02:00
Jacob Vosmaer be3675c8ac Explain why ExclusiveLease has no #cancel 
[ci skip]
 2016-03-24 13:51:33 +01:00
James Lopez cc4d04f97f added rest of importers, fixed specs and some issues with the migration 2016-03-23 17:57:10 +01:00
Lin Jen-Shin 9374b7eb0b Avoid using the same name between methods and variables 2016-03-23 20:05:31 +08:00
James Lopez 6967871fc5 fogbugz importer, also refactored migration again to make it easier to add new importers 2016-03-23 12:52:50 +01:00
James Lopez 46346caf5b fix rubocop warning 2016-03-22 18:14:13 +01:00
James Lopez c136edbbe3 fix gitlab import and spec 2016-03-22 18:03:54 +01:00
James Lopez 8aafe68583 first round of fixes and spec fixes 2016-03-22 17:53:53 +01:00
James Lopez 3b78885eac encrypt credentials in project_creator for bitbucket by default 2016-03-22 12:26:50 +01:00
James Lopez 23146fca18 update bitbucket importer 2016-03-22 12:25:28 +01:00
James Lopez 8a26f83688 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url 2016-03-22 09:56:56 +01:00
Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658 
# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb
 2016-03-21 23:22:21 +01:00
James Lopez e937f312cd Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url 
# Conflicts:
#	db/schema.rb
 2016-03-21 18:41:16 +01:00
James Lopez ced56641bf refactored code based on feedback 2016-03-21 18:09:47 +01:00
James Lopez dff4050f1d fixed some rubocop warnings 2016-03-21 17:29:19 +01:00
James Lopez bd8a77674f fixed few issues with the migration 2016-03-21 17:16:27 +01:00
James Lopez 030b139445 more refactoring 2016-03-21 15:11:05 +01:00
Grzegorz Bizon db8f70d508 Do not rewrite reference if already a cross reference 2016-03-21 14:12:49 +01:00
James Lopez 383cc84047 some refactoring based on feedback 2016-03-21 13:15:51 +01:00
James Lopez 5f86912ef0 Merge branches 'fix/project-import_url' and 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url 
# Conflicts:
#	db/schema.rb
 2016-03-21 09:20:55 +01:00
Douwe Maan 45e8650c4f Fix specs 2016-03-20 23:26:58 +01:00
Douwe Maan 8db1292139 Tweaks, refactoring, and specs 2016-03-20 21:04:07 +01:00
Douwe Maan 2eb19ea3ea Merge branch 'master' into issue_12658 2016-03-20 14:57:25 +01:00
Grzegorz Bizon 6eb3105634 Find referable for each ref found in references rewriter 2016-03-20 10:52:01 +01:00
Grzegorz Bizon 323d328c86 Rename reference unfolder to rewriter, minor refactorings 2016-03-20 10:14:25 +01:00
Grzegorz Bizon 18f25bc942 Update reference unfolder according to recent ability changes 
Commit 43d8bdb4f0 introduced additional
checks for permissions to read issue in references extractor.
 2016-03-19 18:58:52 +01:00
Grzegorz Bizon 0115ad66d2 Merge branch 'master' into feature/issue-move 
* master: (121 commits)
  Dedupe labels in labels selector in Dashboard pages
  Refactor colors and lists
  Add a safeguard in MergeRequest#compute_diverged_commits_count
  Fix an issue when the target branch of a MR had been deleted
  Add avatar to issue and MR pages header
  Cleanup somce css colors
  Re-group scss variables
  Refactor `Todo#target`
  Fixes issue with filter label missing on labels & milestones
  Rename `Todo#to_reference` to `Todo#target_reference`
  Fixed failing tests
  Updated controller with before_action Fixed other issues based on feedback
  Fixes issue on dashboard issues
  Full labels data in JSON
  Fixed issue with labels dropdown getting wrong labels
  Update CHANGELOG
  Use `Note#for_project_snippet?` to skip notes on project snippet
  Use `Commit#short_id` instead of `Commit.truncate_sha`
  Reuse `for_commit?` on conditional validations
  Update schema info comment on todo related files
  ...

Conflicts:
	app/models/issue.rb
	db/schema.rb
	spec/models/issue_spec.rb
 2016-03-19 18:50:15 +01:00
Grzegorz Bizon 9b13ce0b7a Improvements in issue move feaure (refactoring) 
According to endbosses' suggestions.
 2016-03-19 18:46:01 +01:00
Zeger-Jan van de WegandFelipe Artur b959ae553b Improve group visibility level feature 2016-03-18 16:58:04 -03:00
Douwe Maan 9813eac56b Merge branch 'confidential-issues' into 'master' 
Add confidential issues

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3678

More information: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/227

See merge request !3282
 2016-03-18 12:04:56 +00:00
Yorick Peterse 3f0d780c19 Show a notice for diffs that are too large 
This builds on the changes introduced in
https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 and results
in merge requests with large diffs (e.g. due to them containing minified
CSS) loading much faster.
 2016-03-18 12:30:46 +01:00
Douglas Barbosa Alexandre f2ba4e3d36 Restrict access to confidential issues on search results 2016-03-17 20:55:59 -03:00
Felipe Artur 0a7f716119 Code fixes 2016-03-17 19:42:46 -03:00
Grzegorz Bizon 5e3c9475a9 Add minor improvements in code related to issue move 2016-03-17 07:39:16 +01:00
Grzegorz Bizon 4354bfaba5 Add implementation of reference unfolder using banzai 2016-03-17 07:39:16 +01:00
Grzegorz Bizon fd8394faae Move reference unfolder for GFM to separate class 2016-03-17 07:39:15 +01:00
Gabriel Mazetto f54bf00309 Back-porting PostReceive refactor made for EE 🍺 2016-03-17 00:24:12 -03:00
Felipe Artur 44c127447b Merge 4009-external-users into issue_12658 2016-03-16 20:16:42 -03:00
Rubén Dávila 7e03b40221 Return an empty Array when there aren't lines to parse. 2016-03-15 19:51:27 -05:00
Stan Hu 74d7de8196 Revert "Revert "Merge branch 'support-go-subpackages' into 'master' "" 
This reverts commit 5a586f364c
 2016-03-12 21:05:23 +00:00
Douwe Maan 5a586f364c Revert "Merge branch 'support-go-subpackages' into 'master' " 
This reverts merge request !3191
 2016-03-12 17:42:51 +00:00
Douwe Maan 826bc72c12 Merge branch 'support-go-subpackages' into 'master' 
Support Golang subpackage fetching

Closes #13805

See merge request !3191
 2016-03-12 17:38:08 +00:00
Stan Hu 380a67ad4c Ensure PATH_INFO exists for go-get 2016-03-12 08:10:54 -08:00
Stan Hu bb206f947f Simplify code 2016-03-12 07:50:02 -08:00
Douwe Maan ff62e20607 Merge branch 'fix-gh-pr-import' into 'master' 
Fix importing PR's from GitHub when the source repo was removed

Closes #13847 
Closes gitlab-com/support-forum#584

See merge request !3172
 2016-03-12 14:07:45 +00:00
Stan Hu cc065fbeaa Support Golang subpackage fetching 
Closes #13805
 2016-03-12 01:09:37 -08:00
Douwe Maan cb81c8a5ef Merge branch 'rs-issue-12944' into 'master' 
Use a custom Devise failure app to handle unauthenticated .zip requests

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944

See merge request !2828
 2016-03-11 22:34:33 +00:00
Yorick PeterseandRobert Speicher b77b3b16b6 Removed order from sub-query projects for search 
There's no need to order queries used as sub-queries and doing so can
add potential overhead.
 2016-03-11 15:25:23 -05:00
Yorick PeterseandRobert Speicher 8c2868e8ea Added ProjectSearchResults#project_ids_relation 
This ensures some other methods such as the "issues" method still work.
 2016-03-11 15:25:23 -05:00
Yorick PeterseandRobert Speicher ec349dc1b6 Refactor Gitlab::ProjectSearchResults 
Previously this class would be given a project ID which was then used to
retrieve the corresponding Project object. However, in all cases the
Project object was already known as it was used to grab the ID to pass
to ProjectSearchResults. By just passing a Project instead we remove the
need for an extra query as well as the need for some other complexity
in this class.
 2016-03-11 15:25:22 -05:00