summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-diff-comments' into 'master' Robert Speicher2016-01-222-5/+8
|\
| * Properly highlight right side of parallel difffix-diff-commentsDouwe Maan2016-01-221-1/+3
| * Restore diff commentsDouwe Maan2016-01-221-4/+5
* | Merge branch 'unescaped-diffs' into 'master' Robert Speicher2016-01-221-5/+11
|\ \
| * | 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 that calculates total size for artifacts subfolderci/recursive-artifacts-entriesKamil Trzcinski2016-01-202-3/+12
* | Merge branch 'workhorse-path' into 'master' Robert Speicher2016-01-212-3/+9
|\ \
| * | Init script changes for gitlab-workhorse in 8.4Jacob Vosmaer2016-01-212-3/+9
* | | Fix import of GitHub's wiki when the repository has not been createdDouglas Barbosa Alexandre2016-01-211-2/+6
* | | Merge branch 'ci/cache-key' into 'master' Douwe Maan2016-01-211-0/+8
|\ \ \
| * | | Added cache:key to .gitlab-ci.yml allowing to fine tune the cachingci/cache-keyKamil Trzcinski2016-01-201-0/+8
* | | | Merge branch 'fix-github-pull-requests-import' into 'master' Robert Speicher2016-01-201-1/+5
|\ \ \ \
| * | | | 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-202-0/+139
|\ \ \ \ | |/ / /
| * | | Merge branch 'feature/check-against-rbl-only' into 'master'Robert Speicher2016-01-202-0/+139
| |\ \ \
| | * | | Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-onlyTomasz Maczukin2016-01-202-0/+139
| | |/ /
* | | | Merge branch 'master' into issue_3945Douwe Maan2016-01-201-0/+2
|\ \ \ \ | |/ / /
| * | | Gracefully handle invalid UTF-8 sequences in Markdown linksfix-error-500-with-invalid-utf8Stan Hu2016-01-201-0/+2
| |/ /
* | | 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-209-30/+56
|\ \ \ | |/ /
| * | 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 servicesAnton Baklanov2016-01-191-0/+1
| | |/
| * | Merge branch 'user-ldap-email' into 'master' Robert Speicher2016-01-193-22/+29
| |\ \
| | * | Allow LDAP users to change their email if it was not set by the LDAP serverDouwe Maan2016-01-193-22/+29
| | |/
| * | Change 'public' flag to more robust 'visibility' query.Josh Frye2016-01-191-2/+2
| * | Add public params to GET /projects api. Closes #3788Josh Frye2016-01-191-0/+4
| |/
| * Ensure that doesn't have pending migrations when running the specsDouglas Barbosa Alexandre2016-01-191-1/+0
| * Prevent StateMachine warnings from outputting during a cron taskRobert Speicher2016-01-151-0/+3
| * Merge branch 'ci/build_dependencies' into 'master' Douwe Maan2016-01-152-6/+15
| |\
| | * Change dependencies.builds to depends_on_buildsKamil Trzcinski2016-01-151-4/+2
| | * Let the CI runner know about builds that this build depends onci/build_dependenciesKamil Trzcinski2016-01-142-6/+17
| * | Fix signup for some OAuth providersSteffen Köhler2016-01-151-1/+4
* | | 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-1493-368/+1497
|\ \ \ | |/ /
| * | Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-1455-94/+652
| |\ \
| | * \ Merge branch 'diff-parse-first-commit' into 'master'Robert Speicher2016-01-141-2/+3
| | |\ \
| | | * \ Merge branch 'master' into diff-parse-first-commitdiff-parse-first-commitDouwe Maan2016-01-143-0/+100
| | | |\ \
View Lorry Controller Status