summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | Change strategy to highlight diffs. #3945Rubén Dávila2016-01-0713-29/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-073-147/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add some styling for syntax highlighting themes. #3945Rubén Dávila2016-01-077-2/+78
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Force white theme when viewing diffs. #3945Rubén Dávila2016-01-062-2/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Use #html_safe instead of #raw in some diff views. #3945Rubén Dávila2016-01-063-5/+5
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix broken spec. #3945Rubén Dávila2015-12-311-8/+4
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Apply syntax highlighting when expanding diff plus some refactor. #3945Rubén Dávila2015-12-314-27/+74
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Don't modify "match" diff lines. #3945Rubén Dávila2015-12-302-1/+11
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | A bit of refactoring. #3945Rubén Dávila2015-12-304-10/+12
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add specs for Gitlab::Diff::Highlight. #3945Rubén Dávila2015-12-301-0/+28
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix broken spec and small refactor. #3945Rubén Dávila2015-12-306-35/+281
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix Rubocop complain. #3945Rubén Dávila2015-12-301-5/+5
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | New implementation for highlighting diff files. #3945Rubén Dávila2015-12-3010-43/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * It is more performant given now we process all the diff file instead of processing line by line. * Multiline comments are highlighted correctly.
| * | | | | | | | | | | | | | | | Set initial state on parent Lexer. #3945Rubén Dávila2015-12-281-0/+4
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add syntax highlighting to diff view. #3945Rubén Dávila2015-12-286-9/+71
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'ruby_version' into 'master' Achilleas Pipinellis2016-01-202-6/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention required Ruby version Closes #12446 See merge request !2524
| * | | | | | | | | | | | | | | | Mention required Ruby versionruby_versionAchilleas Pipinellis2016-01-202-6/+20
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-01-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note about minimum GitLab CI version Documentation update: To use variables in `.gitlab-ci.yml` it's not enough to update the GitLab Runner, a minimum version of GitLab CI is needed as well. See merge request !2514
| * | | | | | | | | | | | | | | Add note about minimum GitLab CI versionHenning Hoefer2016-01-201-1/+1
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'feature/check-against-rbl-only' into 'master'Robert Speicher2016-01-2010-1/+242
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split from !2455 References #9092 See merge request !2515
| * | | | | | | | | | | | | | Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-onlyTomasz Maczukin2016-01-2010-1/+242
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'fix-error-500-with-invalid-utf8' into 'master' Robert Speicher2016-01-202-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gracefully handle invalid UTF-8 sequences in Markdown links Closes #6077 See merge request !2382
| * | | | | | | | | | | | | | Gracefully handle invalid UTF-8 sequences in Markdown linksfix-error-500-with-invalid-utf8Stan Hu2016-01-202-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #6077
* | | | | | | | | | | | | | | Merge branch 'sentry-integration' into 'master' Robert Speicher2016-01-2010-1/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sentry integration Sentry is an event logging platform primarily focused on capturing and aggregating exceptions. With this MR it will be possible to log and track exceptions from GitLab to Sentry. https://gitlab.com/gitlab-com/operations/issues/39 See merge request !2485
| * | | | | | | | | | | | | | | Target '_blank'sentry-integrationDouwe Maan2016-01-201-2/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Send user context to SentryDouwe Maan2016-01-201-0/+11
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Use sentry in env production onlyJeroen Nijhof2016-01-203-13/+17
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jeroen Nijhof2016-01-2060-146/+585
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sentry-integration Conflicts: db/schema.rb
| * | | | | | | | | | | | | | | Add sentry integrationJeroen Nijhof2016-01-189-1/+61
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'adjust-unicorn-memory-limits' into 'master' Robert Speicher2016-01-202-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ENV variables for Unicorn worker killer & increase default limits Merge request that lead to this particular merge request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2421 [ci skip] See merge request !2513
| * | | | | | | | | | | | | | Increase Unicorn memory limits to 300-350adjust-unicorn-memory-limitsYorick Peterse2016-01-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using this limit on GitLab.com it appears we're able to reduce response timings by about 620 milliseconds compared to the previous limit. See gitlab-org/gitlab-ce!2421 for more information.
| * | | | | | | | | | | | | | Use env variables for Unicorn memory limitsYorick Peterse2016-01-202-1/+6
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier for users to use their own limits based on their server configuration.
* | | | | | | | | | | | | | Merge branch 'update-gitlab_git' into 'master' Douwe Maan2016-01-203-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgraded gitlab_git to fix issue #5858 This updates the dependency on gitlab_git and fixes #5858 - reproduced locally and issue disappears with the change. Related MR that actually adds branch name support to commits_between: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/61 See merge request !2516
| * | | | | | | | | | | | | | updated gitlab_git to fix issue #5858 and updated changelogJames Lopez2016-01-203-3/+4
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'awardemoji-tooltip-shows-people-multiple-times' into 'master' Dmitriy Zaporozhets2016-01-201-10/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes tooltip doesn't duplicate the "me" name. Checks that "me" is not in the array of names in tooltip ![emojilist](/uploads/20b1a39cda194358f9730ec3c6b86acb/emojilist.gif) Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/7978 See merge request !2454
| * | | | | | | | | | | | | | Fixes issue where other emoji (not thumbup/thumbdown) were not removedawardemoji-tooltip-shows-people-multiple-timesJacob Schatz2016-01-191-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix the situation where the user has named themselves "me"Jacob Schatz2016-01-181-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stopped looking for existing user since remove functionality is fixed.
| * | | | | | | | | | | | | | Fix underlying issue with emoji reactionsJacob Schatz2016-01-181-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue was: blank space was rendering as a element in an array of authors. Element was being used by `join`. Original fix !2450 was trying to remove the space after it happened. This checks properly for it and only moves forward if it does not exist. Also removes "me" upon unchecking emoji.
| * | | | | | | | | | | | | | Removing initial `,`.Jacob Schatz2016-01-181-1/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixes tooltip doesn't duplicate the "me" name.Jacob Schatz2016-01-181-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checks that "me" is not in the array of names in tooltip
* | | | | | | | | | | | | | | Merge branch 'secret-shortcut-feature' into 'master' Dmitriy Zaporozhets2016-01-206-7/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds "t" as a shortcut for find file anywhere See merge request !2507
| * | | | | | | | | | | | | | | Simplifies the HAML if statement for project branch URLJacob Schatz2016-01-201-6/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix HTML so code passessecret-shortcut-featureJacob Schatz2016-01-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code was failing because branch was named `'test'` with quotes which was escaping the javascript I was using.
| * | | | | | | | | | | | | | | Fixes test to not search whole page for content.Jacob Schatz2016-01-201-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix project find url so branch ref is not nilJacob Schatz2016-01-192-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds autocomplete="off" to find input.
| * | | | | | | | | | | | | | | Proper spacing in HAML file `if` statement.Jacob Schatz2016-01-191-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Removes `defined?` in favor to just `if`Jacob Schatz2016-01-191-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add reference to the correct branch.Jacob Schatz2016-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sometimes `@ref` will be `nil`. this makes sure that the correct branch is passed in.
| * | | | | | | | | | | | | | | Adds `t` as a shortcut for find file anywhereJacob Schatz2016-01-194-5/+4
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-01-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed invalid JSON in first JSON Example Just a comma missing See merge request !2487
View Lorry Controller Status