home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,943 Commits 48 Branches 340 Tags
54aa0969d40549014bee6e4e500276405fb055ee
Commit Graph
3539 Commits
Author SHA1 Message Date
Robert Speicher 44b4c9d060 Merge branch 'patch-1' into 'master' 
Consistent rails_socket use.

[ci skip]

See merge request !2596
 2016-02-02 17:33:37 +00:00
Jacob Vosmaer 752468d55b Merge branch 'git-raw-workhorse' into 'master' 
Send raw Git blobs via gitlab-workhorse



See merge request !2451
 2016-02-02 17:22:04 +00:00
James Lopez ecb174bfea fixed move project method in migration 2016-02-02 17:28:14 +01:00
Dmitriy Zaporozhets 30313098a0 Merge branch 'Michi302/gitlab-ce-fix/pagination-links' into 'master' 
Fix add_pagination_headers to keep request parameters in Link header

Originally opened at !2321. Closes #5904. /cc @Michi302

See merge request !2674
 2016-02-02 16:04:08 +00:00
Michi302andRémy Coutable c41a8be8d2 Fix add_pagination_headers to keep request parameters in Link header 2016-02-02 15:26:29 +01:00
James Lopez ae73e73bee Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue 2016-02-02 15:15:59 +01:00
Jacob Vosmaer 15a1acb479 Merge remote-tracking branch 'origin/master' into git-raw-workhorse 2016-02-02 15:06:19 +01:00
Jacob Vosmaer d3affe8bca Merge remote-tracking branch 'origin/master' into lazy-blobs 2016-02-02 15:04:54 +01:00
Douglas Barbosa Alexandre 07384aa00d Memoize Akismet client initialization on AkismetHelper 2016-02-02 11:25:44 -02:00
Douglas Barbosa Alexandre a2bbf00477 Refactor spam filtering on issues API 2016-02-02 11:25:44 -02:00
Stan HuandDouglas Barbosa Alexandre d20e75a8d8 Support Akismet spam checking for creation of issues via API 
Currently any spam detected by Akismet by non-members via API will be logged
in a separate table in the admin page.

Closes #5612
 2016-02-02 11:25:44 -02:00
Jacob Vosmaer 771f14b96e First version of "git archive" headers 2016-02-02 14:09:55 +01:00
Kamil Trzcinski 055afab5c7 Make the CI permission model simpler 
This MR simplifies CI permission model:
- read_build: allows to read a list of builds, artifacts and trace
- update_build: allows to cancel and retry builds
- create_build: allows to create builds from gitlab-ci.yml (not yet implemented)
- admin_build: allows to manage triggers, runners and variables
- read_commit_status: allows to read a list of commit statuses (including the overall of builds)
- create_commit_status: allows to create a new commit status using API

Remove all extra methods to manage permission.
Made all controllers to use explicitly the new permissions.
 2016-02-02 09:18:08 +01:00
Jacob Vosmaer 72bd004b31 Allow "@" in file names and path 2016-02-01 16:20:49 +01:00
James Lopez 850942ceba Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue 2016-02-01 15:49:03 +01:00
Jacob Vosmaer 51574d779c Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobs 2016-02-01 13:51:05 +01:00
Jacob Vosmaer b1f22aa35a Gotta have newlines 2016-02-01 12:27:35 +01:00
Jacob Vosmaer 2679ec4066 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-raw-workhorse 2016-02-01 11:33:36 +01:00
Jacob Vosmaer 02afa6793c Use only one header to send git blobs 2016-02-01 11:33:22 +01:00
Jacob Vosmaer 64c8ee47c9 WIP lazy blobs 2016-02-01 10:41:52 +01:00
Robert Speicher 5d4f8012f6 Merge branch 'rename-inline-diff' into 'master' 
Mark inline difference between old and new paths when a file is renamed

See merge request !2652
 2016-01-31 03:04:33 +00:00
Douwe Maan 677b4db9e6 Mark inline difference between old and new paths when a file is renamed 2016-01-29 19:37:17 +01:00
James Lopez eb51a4ac1b refactor previous test and add validation to project model 2016-01-29 15:35:21 +01:00
Josh Frye 91b9cbff8d First pass at deleting projects in the background. 2016-01-29 09:14:16 -05:00
Robert Speicher ca05054ea2 Partially revert "Add IP check against DNSBLs at account sign-up" 
This partially reverts 6a5cd3ca - we keep the migration and add a new
migration that reverts it in order to keep migration history intact.
 2016-01-28 16:28:19 -05:00
Robert Speicher 0e79b5f396 Merge branch 'highlight-blame' into 'master' 
Fix highlighting in blame view.

See merge request !2630
 2016-01-28 20:30:21 +00:00
Jacob Vosmaer 26d97ac5e1 Send more raw blob data with workhorse 2016-01-28 18:04:46 +01:00
Dmitriy Zaporozhets ee8884c68e Merge branch 'fix-preventing-migration-from-crashing-in-specific-cases' into 'master' 
Fix preventing migration from crashing in very specific cases

Closes #12606. Closes #12501.

/cc @yorickpeterse @dbalexandre 

See merge request !2600
 2016-01-28 15:20:14 +00:00
Douwe Maan 590e237d55 Merge branch 'master' into highlight-blame 2016-01-28 14:49:34 +01:00
Douwe Maan b636f83e59 Move blame group logic to dedicated class 2016-01-28 14:49:21 +01:00
Dmitriy Zaporozhets dfb8803c1c Improve consistency and duplication for Merge Request API 
* Follow REST for merge request API route
* Remove repeating comments API for MR

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-28 14:26:12 +01:00
Rémy Coutable 55ab92c00b Use ActiveRecord::Base.connection.active? and rescue any exception in connect_to_db? 
This ensures that rake tasks that don't need a DB connection can be run
without one.
 2016-01-28 12:23:37 +01:00
Rémy Coutable 869b4d7c6a Only create the defaults ApplicationSetting when DB is fully migrated 
Return a fake application settings OpenStruct when this is not the case.
Also, use ActiveRecord::Base.connection_pool.active_connection? instead
of ActiveRecord::Base.connection.active? to avoid driver exception.
 2016-01-28 11:26:28 +01:00
Robert Speicher 40403c78ef Merge branch 'fix-ci-runners-version-update' into 'master' 
Fix CI runner version not being properly updated when asked for a build

Due to broken implementation of attribute_for_keys the runner information was not updated correctly.

This MR adds test to check that such scenario will never happen again.

See merge request !2618
 2016-01-27 20:50:24 +00:00
Douwe Maan 1226d16675 Merge branch 'hot-reloading' into 'master' 
Fix hot reloading for CI API



See merge request !2617
 2016-01-27 15:26:59 +00:00
Kamil Trzcinski 95d2f0fb51 Fix CI runner version not being properly updated when asking for a build 
Due to broken implementation of attribute_for_keys the runner information was not updated correctly.

This MR adds test to check that such scenario will never happen again.
 2016-01-27 12:04:54 +01:00
Kamil Trzcinski 5ea32ba498 Fix hot reloading for CI API 2016-01-26 19:05:04 +01:00
Rémy Coutable e6f3fe5d3b Ensure rake tasks that don't need a DB connection can be run without one 
When using ActiveRecord::Base.connection.active? without a DB
connection, we get a "PG::ConnectionBad: could not connect to server"
error because ActiveRecord::Base.connection doesn't exist. By using
ActiveRecord::Base.connected? we ensure we don't get this error if
the connection is missing, which is the all point of the
Gitlab::CurrentSettings#connect_to_db? method!
 2016-01-26 15:11:15 +01:00
Douglas Barbosa Alexandre b58a2e30b2 Wrap errors on GitHub importer to raise Projects::ImportService::Error 2016-01-26 10:56:22 -02:00
Douglas Barbosa Alexandre c040323419 Move Gitlab::BitbucketImport::KeyDeleter to it's own importer 2016-01-26 10:56:22 -02:00
Yorick Peterse b74308c0a7 Correct arity for instrumented methods w/o args 
This ensures that an instrumented method that doesn't take arguments
reports an arity of 0, instead of -1.

If Ruby had a proper method for finding out the required arguments of a
method (e.g. Method#required_arguments) this would not have been an
issue. Sadly the only two methods we have are Method#parameters and
Method#arity, and both are equally painful to use.

Fixes gitlab-org/gitlab-ce#12450
 2016-01-25 21:28:59 +01:00
Rémy Coutable cd22da3ebd Fix preventing migration from crashing in very specific cases 
See https://gitlab.com/gitlab-org/gitlab-ce/issues/12606 for details
 2016-01-25 20:00:59 +01:00
fbretel 5287da7412 Consistent rails_socket use. 2016-01-25 13:19:27 +00:00
Benedict Etzel 6435f78a8c Whitelist raw "abbr" elements when parsing Markdown 
Closes #12517
 2016-01-23 20:38:06 +01:00
Valery Sizov be7bc9d9b0 Backport some changes from EE 2016-01-22 11:24:44 +02:00
Robert Speicher 2fed8bf390 Merge branch 'fix-diff-comments' into 'master' 
More highlighted diff fixes

See merge request !2545
 2016-01-22 07:37:47 +00:00
Robert Speicher 9a5f83a30a Merge branch 'unescaped-diffs' into 'master' 
Make sure non-highlighted diffs are still escaped

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12521

See merge request !2544
 2016-01-22 01:35:39 +00:00
Douwe Maan 3db24ec9e8 Properly highlight right side of parallel diff 2016-01-22 02:12:43 +01:00
Douwe Maan 16d17b78ca Restore diff comments 2016-01-22 02:10:58 +01:00
Douwe Maan 82d0fa8e45 Fix 2016-01-22 01:53:01 +01:00