summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge branch 'unescaped-diffs' into 'master' Robert Speicher2016-01-221-5/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure non-highlighted diffs are still escaped Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12521 See merge request !2544
| | * | | FixDouwe Maan2016-01-221-2/+2
| | | | |
| | * | | Make sure non-highlighted diffs are still escapedunescaped-diffsDouwe Maan2016-01-221-5/+11
| | |/ /
| * | | Merge branch 'ci/recursive-artifacts-entries' into 'master' Robert Speicher2016-01-212-3/+12
| |\ \ \ | | |/ / | |/| | | | | | | | | | Add method to calculate total size of artifacts in subpath See merge request !2500
| | * | Add method that calculates total size for artifacts subfolderci/recursive-artifacts-entriesKamil Trzcinski2016-01-202-3/+12
| | | |
| * | | Fix import of GitHub's wiki when the repository has not been createdDouglas Barbosa Alexandre2016-01-211-2/+6
| | | |
| * | | Merge branch 'fix-github-pull-requests-import' into 'master' Robert Speicher2016-01-201-1/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cross projects detection when importing GitHub pull requests Fixes #12456 See merge request !2523
| | * | | Fix cross projects detection when importing GitHub pull requestsDouglas Barbosa Alexandre2016-01-201-1/+5
| | | | |
| * | | | Merge branch 'master' into issue_3945issue_3945Rubén Dávila2016-01-201-0/+34
| |\ \ \ \ | | |/ / /
| | * | | Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-onlyTomasz Maczukin2016-01-201-0/+34
| |/ / / |/| | |
| * | | Validate bounds just to be sureDouwe Maan2016-01-201-0/+3
| | | |
| * | | Properly highlight lines around '\ No newline at end of file'Douwe Maan2016-01-203-7/+15
| | | |
| * | | Save and use actual diff base commit for MR diff highlightingDouwe Maan2016-01-203-9/+25
| | | |
| * | | Properly handle HTML entities with inline diffsDouwe Maan2016-01-203-15/+19
| | | |
| * | | Merge branch 'master' into issue_3945Douwe Maan2016-01-205-24/+34
| |\ \ \ | |/ / / |/| | |
| * | | Move parallel diff logic to separate classDouwe Maan2016-01-202-0/+121
| | | |
| * | | Don't crash when file can't be highlightedDouwe Maan2016-01-191-9/+3
| | | |
| * | | Refactor Gitlab::Highlight and fix testsDouwe Maan2016-01-191-6/+20
| | | |
| * | | Remove useless assignmentsDouwe Maan2016-01-191-2/+0
| | | |
| * | | Add testsDouwe Maan2016-01-152-0/+11
| | | |
| * | | Whoops, forgot to add filesDouwe Maan2016-01-152-0/+160
| | | |
| * | | Move inline diff marker logic to its own classDouwe Maan2016-01-151-95/+11
| | | |
| * | | Move inline diff logic to its own classDouwe Maan2016-01-151-73/+11
| | | |
| * | | Method was movedDouwe Maan2016-01-151-2/+2
| | | |
| * | | Merge branch 'master' into issue_3945Rubén Dávila2016-01-1433-233/+762
| |\ \ \
| * | | | More refactoring from last code review. #3945Rubén Dávila2016-01-142-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use commit objects instead of IDs when generating diffs * Use proper references when generating MR's source and target * Update broken specs
| * | | | Add inline diff markers in highlighted diffs.Douwe Maan2016-01-143-34/+181
| | | | |
| * | | | Refactor highlighting linesDouwe Maan2016-01-141-25/+4
| | | | |
| * | | | Remove duplication around highlighting.Douwe Maan2016-01-142-12/+24
| | | | |
| * | | | Use #sub instead of #gsub!. #3945Rubén Dávila2016-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This is because is not a good idea to modify the original lines * Also I run into this issue https://gitlab.com/gitlab-org/gitlab_git/issues/14 which is returning Diff Lines with the same @new_pos value.
| * | | | Little refactor for usage of html_safe. #3945Rubén Dávila2016-01-131-2/+2
| | | | |
| * | | | Fix broken specs. #3945Rubén Dávila2016-01-121-1/+1
| | | | |
| * | | | Remove no longer required code. #3945Rubén Dávila2016-01-121-42/+9
| | | | |
| * | | | Small fixes from code review. #3945Rubén Dávila2016-01-121-4/+0
| | | | |
| * | | | Fix broken spec for submodule commit. #3945Rubén Dávila2016-01-091-2/+10
| | | | |
| * | | | Fix broken specs. #3945Rubén Dávila2016-01-081-5/+5
| | | | |
| * | | | Remove custom Lexer. #3945 [ci skip]Rubén Dávila2016-01-081-2/+1
| | | | | | | | | | | | | | | | | | | | Inline diff is going to be generated client side now. #3945
| * | | | Change strategy to highlight diffs. #3945Rubén Dávila2016-01-072-20/+58
| | | | | | | | | | | | | | | | | | | | | | | | | Now we apply syntax highlighting to the whole old and new files. This basically help us to highlight adequately multiline content.
| * | | | Don't process inline diffs on backend. #3945Rubén Dávila2016-01-072-108/+1
| | | | |
| * | | | Apply syntax highlighting when expanding diff plus some refactor. #3945Rubén Dávila2015-12-311-12/+43
| | | | |
| * | | | Don't modify "match" diff lines. #3945Rubén Dávila2015-12-301-1/+6
| | | | |
| * | | | A bit of refactoring. #3945Rubén Dávila2015-12-302-9/+9
| | | | |
| * | | | Fix broken spec and small refactor. #3945Rubén Dávila2015-12-302-3/+3
| | | | |
| * | | | Fix Rubocop complain. #3945Rubén Dávila2015-12-301-5/+5
| | | | |
| * | | | New implementation for highlighting diff files. #3945Rubén Dávila2015-12-303-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * It is more performant given now we process all the diff file instead of processing line by line. * Multiline comments are highlighted correctly.
* | | | | Merge branch 'add_email_headers' into 'master' Robert Speicher2016-01-191-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Added X-GitLab-... headers to emails from CI and Email On Push servicesAnton Baklanov2016-01-191-0/+1
| | |_|/ / | |/| | | | | | | | | | | | | Fixes #2098
* | | | | Allow LDAP users to change their email if it was not set by the LDAP serverDouwe Maan2016-01-193-22/+29
|/ / / /
* | | | Ensure that doesn't have pending migrations when running the specsDouglas Barbosa Alexandre2016-01-191-1/+0
| |_|/ |/| |
* | | Fix signup for some OAuth providersSteffen Köhler2016-01-151-1/+4
| |/ |/| | | | | | | | | 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.
View Lorry Controller Status