home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,025 Commits 48 Branches 340 Tags
7ea60c8564b18788990ce8b45decd0932d71ba6e
Commit Graph
690 Commits
Author SHA1 Message Date
Grzegorz Bizon eb7721e183 Add second build for each commit in build seeds 2016-02-11 10:29:14 +01:00
Robert Speicher 7ea60fbfc8 Merge remote-tracking branch 'dev/master' into 'master' 2016-02-09 12:13:58 -05:00
Douwe Maan a52c5778bb Merge branch 'index_snippet' into 'master' 
Add index for snippet's updated_at

@DouweM We are ordering by `updated_at` but there is no index.

cc @yorickpeterse 

See merge request !2768
 2016-02-09 16:12:58 +00:00
Douwe Maan 706b101f51 Merge branch 'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail' into 'master' 
Add option to include the sender name in body of Notify email

_Originally opened at !2495 by @huacnlee._

- - -

Fixes #7824.

See merge request !2767
 2016-02-09 14:12:56 +00:00
Douwe Maan 80352b783c Merge branch '3kami3/gitlab-ce-root_email' into 'master' 
Add an option to supply root email through an environmental variable.

_Originally opened at !2499 by @3kami3._

---

Add an option to supply root email through an environmental variable.

See merge request !2751
 2016-02-09 13:55:52 +00:00
Valery Sizov 6c3cd241e8 Add index for snippet's updated_at 2016-02-09 15:10:22 +02:00
Jason LeeandRémy Coutable 9474e36f46 Add option to include the sender name in body of Notify email. fix #7824 2016-02-09 12:58:13 +01:00
Douwe Maan a5c2e7a486 Merge branch 'fix/atom-url-issue' into 'master' 
do not rename .aToM but only .atom projects in migration

Sorry @DouweM forgot to add this.

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2651/diffs#bc35672f73f4ee025132aee428f383acdf0f755e_0_51

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

See merge request !2712
 2016-02-09 10:39:20 +00:00
3kami3andRémy Coutable cdcedd5b26 Add an option to supply root email through an environmental variable. 2016-02-08 18:26:29 +01:00
Kamil Trzcinski 170ca8435a Merge branch 'master' into ci-permissions 
# Conflicts:
#	db/schema.rb
 2016-02-05 20:15:32 +01:00
James Lopez c663ca434f remove unnecessary lower function on SQL 2016-02-04 18:38:11 +01:00
Douwe Maan ac923b4fb4 Merge branch 'fix/atom-url-issue' into 'master' 
Fix atom url issue on projects

This MR adds prevents a project to have a path ending in .atom that conflicts with the feed

and 

Adds a migration to migrate old .atom projects to a different path

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

See merge request !2651
 2016-02-04 16:12:47 +00:00
James Lopez 5dc77d7577 refactored migration based on feedback 2016-02-04 15:35:03 +01:00
James Lopez 7b868c61ab refactored migration and spec based on feedback 2016-02-04 13:20:55 +01:00
Kamil Trzcinski 6fea7c386f Merge remote-tracking branch 'origin/master' into ci-permissions 
# Conflicts:
#	app/views/projects/builds/index.html.haml
 2016-02-04 13:16:48 +01:00
Kamil Trzcinski b4c36130cc Rename allow_guest_to_access_builds to public_builds 2016-02-04 12:57:46 +01:00
Kamil Trzcinski 627909c2a4 Add CI setting: allow_guest_to_access_builds 
Add the `read_build` ability if user is anonymous or guest and allow_guest_to_access_builds is enabled.
 2016-02-02 17:59:37 +01:00
James Lopez ecb174bfea fixed move project method in migration 2016-02-02 17:28:14 +01: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
James Lopez 94b27f9d79 added TODO to not working method 2016-02-01 15:49:52 +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
James Lopez 927ab48101 WIP - refactored migration 2016-02-01 15:47:11 +01:00
Dmitriy Zaporozhets f862b4ae0f Merge remote-tracking branch 'origin/background-delete-process' 2016-01-30 12:14:48 +01:00
James Lopez 7dffec2c43 WIP - add migration 2016-01-29 18:52:49 +01:00
Drew Blessing 873f336ecc Increase LFS objects size column 2016-01-29 08:28:58 -06:00
Josh Frye f255313ea4 Update CHANGELOG 2016-01-29 09:23:24 -05: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
Rubén Dávila 985297d82a Merge branch 'master' into issue_3945 2016-01-20 15:07:00 -05:00
Robert Speicher 1553c560e0 Merge branch 'feature/check-against-rbl-only' into 'master' 
Split from !2455

References #9092

See merge request !2515
 2016-01-20 14:24:20 -05:00
Douwe Maan 7d347ae564 Merge branch 'master' into issue_3945 2016-01-20 20:04:15 +01:00
Douwe Maan 577f2fb47a Save and use actual diff base commit for MR diff highlighting 2016-01-20 18:44:27 +01:00
Tomasz Maczukin 8536e083f7 Add IP blocking against DNSBL at sign-up 2016-01-20 15:28:19 +01:00
Jeroen Nijhof 7658a64469 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into sentry-integration 
Conflicts:
	db/schema.rb
 2016-01-20 09:07:10 +01:00
Douwe Maan 4f44455626 Merge branch 'master' into user-ldap-email 
# Conflicts:
#	db/schema.rb
 2016-01-19 18:30:59 +01:00
Douwe Maan 98e1a5b634 Allow LDAP users to change their email if it was not set by the LDAP server 2016-01-19 16:25:38 +01:00
Yorick Peterse b4ee6f57b9 Greatly improve external_issue_tracker performance 
This greatly improves the performance of Project#external_issue_tracker
by moving most of the fields queried in Ruby to the database and letting
the database handle all logic. Prior to this change the process of
finding an external issue tracker was along the lines of the following:

1. Load all project services into memory.
2. Reduce the list to only services where "issue_tracker?" returns true
3. Reduce the list from step 2 to service where "default?" returns false
4. Find the first service where "activated?" returns true

This has to two big problems:

1. Loading all services into memory only to reduce the list down to a
   single item later on is a waste of memory (and slow timing wise).
2. Calling Array#select followed by Array#reject followed by Array#find
   allocates extra objects when this really isn't needed.

To work around this the following service fields have been moved to the
database (instead of being hardcoded):

* category
* default

This in turn means we can get the external issue tracker using the
following query:

    SELECT *
    FROM services
    WHERE active IS TRUE
    AND default IS FALSE
    AND category = 'issue_tracker'
    AND project_id = XXX
    LIMIT 1

This coupled with memoizing the result (just as before this commit)
greatly reduces the time it takes for Project#external_issue_tracker to
complete. The exact reduction depends on one's environment, but locally
the execution time is reduced from roughly 230 ms to only 2 ms (= a
reduction of almost 180x).

Fixes gitlab-org/gitlab-ce#10771
 2016-01-19 14:03:20 +01:00
Tomasz Maczukin b76bfe35c7 Add limit change for 'data' column in 'events' when using MySQL 2016-01-18 21:27:56 +01:00
Jeroen Nijhof 85e0fce9ee Add sentry integration 2016-01-18 17:15:10 +01:00
Kirilll Zaycev e80113593c Raise hook url limit 2016-01-15 00:35:12 +03:00
Grzegorz Bizon ad5302ba15 Seed db on development with artifacts metadata fixture 2016-01-14 12:48:14 +01:00
Grzegorz Bizon 662f4b9e1d Add artifacts metadata uploader filed 
Artifacts metadata field will be used to store a filename of gzipped
file containing metadata definition for given artifacts archive.
 2016-01-14 12:48:14 +01:00
Grzegorz Bizon 87df1df3cd Seed db with CI build artifacts using a zip archive 2016-01-14 12:48:13 +01:00
Grzegorz Bizon ebd69c5fc1 Remove artifacts metadata column from database 2016-01-14 12:48:13 +01:00
Grzegorz Bizon a385d39ff1 Improve CI builds seeder 2016-01-14 12:48:12 +01:00
Grzegorz Bizon 7027bf40c6 Add database seed for build artifacts 2016-01-14 12:48:12 +01:00
Grzegorz Bizon 5f67bf74f4 Improve CI builds fixtures 2016-01-14 12:48:12 +01:00
Grzegorz Bizon ff2d1dd2e8 Add initial fixtures for CI builds 2016-01-14 12:48:12 +01:00
Grzegorz Bizon d032c5b90e Add artifacts metadata field to ci_builds 2016-01-14 12:48:12 +01:00
Robert Speicher 6ae39c2cd1 Remove alert_type attribute from BroadcastMessage 2016-01-13 11:34:57 -05:00