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
23,087 Commits 48 Branches 340 Tags
e08e90edbbd28533f215f0dcf274baefb9fc87fd
Commit Graph
1460 Commits
Author SHA1 Message Date
Douglas Barbosa Alexandre 4861b1bbfb Fix import of GitHub's wiki when the repository has not been created 2016-01-21 13:11:38 -02:00
Robert Speicher 3e7092a83a Merge branch 'fix-github-pull-requests-import' into 'master' 
Fix cross projects detection when importing GitHub pull requests

Fixes #12456

See merge request !2523
 2016-01-20 22:11:20 +00:00
Douglas Barbosa Alexandre f4bdbecfd5 Fix cross projects detection when importing GitHub pull requests 2016-01-20 19:36:35 -02:00
Rubén Dávila 985297d82a Merge branch 'master' into issue_3945 2016-01-20 15:07:00 -05:00
Douwe Maan 6000f8545f Validate bounds just to be sure 2016-01-20 19:33:34 +01:00
Douwe Maan 0e992a3b4e Properly highlight lines around '\ No newline at end of file' 2016-01-20 19:20:13 +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
Douwe Maan a010db5db2 Properly handle HTML entities with inline diffs 2016-01-20 15:26:44 +01:00
Douwe Maan c23ca0b0b5 Merge branch 'master' into issue_3945 2016-01-20 14:53:41 +01:00
Douwe Maan 701513dcc7 Move parallel diff logic to separate class 2016-01-20 14:53:20 +01:00
Robert Speicher 1f9c360d7b Merge branch 'add_email_headers' into 'master' 
Added X-GitLab-... headers to emails from CI and Email On Push services

Fixes #2098

This adds the 'X-GitLab-Project', 'X-GitLab-Project-Id' and
'X-GitLab-Project-Path' headers to emails from CI and Email On Push in a way
that it is done currently for merge requests and issues emails.

Additionally, CI emails will have 'X-GitLab-Build-Status' header with either
'fail' or 'success'.

Emails from Email On Push will include 'X-Gitlab-Author' header containing the
username of user who did the push.

See merge request !2159
 2016-01-19 21:23:54 +00:00
Anton Baklanov 84124380e8 Added X-GitLab-... headers to emails from CI and Email On Push services 
Fixes #2098
 2016-01-19 20:18:39 +02: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
Douwe Maan 5c7259c7c3 Don't crash when file can't be highlighted 2016-01-19 15:13:37 +01:00
Douwe Maan 512bebe21d Refactor Gitlab::Highlight and fix tests 2016-01-19 14:52:41 +01:00
Douwe Maan 0a8039eb77 Remove useless assignments 2016-01-19 13:56:36 +01:00
Douglas Barbosa Alexandre bddef293d6 Ensure that doesn't have pending migrations when running the specs 2016-01-19 00:12:30 -02:00
Douwe Maan 12546f895f Add tests 2016-01-15 16:29:26 +01:00
Douwe Maan 5de8971ddf Whoops, forgot to add files 2016-01-15 16:02:48 +01:00
Steffen Köhler 2444c04055 Fix signup for some OAuth providers 
some OAuth providers (kerberos for example) only provide a username and an email, but no name. Therefore
a signup fails because the name is empty. Best guess for the name is
probably the username, therefore use it as name.
 2016-01-15 14:55:52 +01:00
Douwe Maan 13f10efcf1 Move inline diff marker logic to its own class 2016-01-15 14:39:43 +01:00
Douwe Maan 7d31f37219 Move inline diff logic to its own class 2016-01-15 14:25:29 +01:00
Douwe Maan 71b4341a37 Method was moved 2016-01-15 14:11:36 +01:00
Rubén Dávila c8db25c37c Merge branch 'master' into issue_3945 2016-01-14 17:28:44 -05:00
Rubén Dávila 6b9c730e91 More refactoring from last code review. #3945 
* Use commit objects instead of IDs when generating diffs
* Use proper references when generating MR's source and target
* Update broken specs
 2016-01-14 16:47:55 -05:00
Douwe Maan 8dfad143d4 Add inline diff markers in highlighted diffs. 2016-01-14 22:28:07 +01:00
Robert Speicher 17d4b39806 Merge branch 'diff-parse-first-commit' into 'master' 
Properly generate diff of orphan commits, like the first commit in a
repository

Fixes gitlab-org/gitlab_git#14

See merge request !2427
 2016-01-14 14:29:08 -05:00
Robert Speicher 65eae647a6 Merge branch 'backport-ee' into 'master' 
Backport two commits from EE

Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/110

See merge request !2424
 2016-01-14 18:39:49 +00:00
Douwe Maan 83e4fc188b Refactor highlighting lines 2016-01-14 16:13:35 +01:00
Douwe Maan 3a1d053599 Remove duplication around highlighting. 2016-01-14 15:11:50 +01:00
Douglas Barbosa Alexandre 89e8b82b63 Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatter 2016-01-14 12:09:31 -02:00
Douglas Barbosa Alexandre 60f8434a9d Refactoring Gitlab::GithubImport::Importer 2016-01-14 12:09:31 -02:00
Douglas Barbosa Alexandre 78f5eb94fb Import GitHub wiki into GitLab 2016-01-14 12:09:31 -02:00
Douwe Maan 05187f0fc6 Properly generate diff of orphan commits, like the first commit in a repository 2016-01-14 13:09:36 +01:00
Grzegorz Bizon be764a3a20 Minor improvements in build arfifacts browser 
Added also a `Gitlab::Ci::Build::Artifacts::Metadata::ParserError`
exception class.
 2016-01-14 12:48:17 +01:00
Grzegorz Bizon 0d6e7b9d3d Use Hash to store paths and entries metadata in artifacts browser 2016-01-14 12:48:17 +01:00
Grzegorz Bizon ad2b0358e0 Improve readability of artifacts Metadata related code 2016-01-14 12:48:17 +01:00
Grzegorz Bizon 6b0a43aff3 Improve readability of artifacts browser Entry related code 2016-01-14 12:48:17 +01:00
Grzegorz Bizon 3f0c18f80e Simplify encoding related implementation in artifacts metadata 2016-01-14 12:48:17 +01:00
Grzegorz Bizon a9783c439b Make encoding of paths returned by metadata consistent (UTF-8) 2016-01-14 12:48:16 +01:00
Grzegorz Bizon 487b0a026f Improvements, readability for artifacts browser 2016-01-14 12:48:16 +01:00
Grzegorz Bizon 2be76355ca Support only valid UTF-8 paths in build artifacts browser 2016-01-14 12:48:16 +01:00
Grzegorz Bizon ffee05c242 Improve invalid build artifacts metadata path matcher 2016-01-14 12:48:16 +01:00
Grzegorz Bizon 09a4a5aff8 Render only valid paths in artifacts metadata 
In this version we will support only relative paths in artifacts
metadata. Support for absolute paths will be introduced later.
 2016-01-14 12:48:16 +01:00
Grzegorz Bizon 61fb47a432 Simplify implementation of build artifacts browser (refactoring) 2016-01-14 12:48:15 +01:00
Grzegorz Bizon 387b27813d Change format of artifacts metadata from text to binary 0.0.1 
This changes the format of metadata to handle paths, that may contain
whitespace characters, new line characters and non-UTF-8 characters.

Now those paths along with metadata in JSON format are stored as
length-prefixed strings (uint32 prefix).

Metadata file has a custom format:

1.   First string field is metadata version field (string)
2.   Second string field is metadata errors field (JSON strong)
3.   All subsequent fields is pair of path (string) and path metadata
     in JSON format.

Path's metadata contains all fields that where possible to extract from
ZIP archive like date of modification, CRC, compressed size,
uncompressed size and comment.
 2016-01-14 12:48:15 +01:00
Grzegorz Bizon 1b1793c253 Show file size in artifacts browser using metadata 2016-01-14 12:48:15 +01:00
Grzegorz Bizon cd3b8bbd2f Add method that checks if path exists in StringPath 2016-01-14 12:48:15 +01:00
Grzegorz Bizon a5e1905d28 Render 404 when artifacts path is invalid 2016-01-14 12:48:15 +01:00