| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Backport some changes from EEes_backport | Valery Sizov | 2016-01-22 | 4 | -0/+81 |
| | | |||||
| * | Merge branch 'fix-mr-diff-edit-button' into 'master' | Robert Speicher | 2016-01-22 | 4 | -29/+27 |
| |\ | | | | | | | | | | | | | Fix MR diff 'Edit' button It now works and has the right size. See merge request !2542 | ||||
| | * | Fix MR diff 'Edit' buttonfix-mr-diff-edit-button | Douwe Maan | 2016-01-21 | 4 | -29/+27 |
| | | | |||||
| * | | Merge branch 'fix-diff-comments' into 'master' | Robert Speicher | 2016-01-22 | 1 | -1/+2 |
| |\ \ | | | | | | | | | | | | | More highlighted diff fixes See merge request !2545 | ||||
| | * | | Restore diff comments | Douwe Maan | 2016-01-22 | 1 | -1/+2 |
| | |/ | |||||
| * | | Merge branch 'unescaped-diffs' into 'master' | Robert Speicher | 2016-01-22 | 2 | -3/+9 |
| |\ \ | | | | | | | | | | | | | | | | | | | Make sure non-highlighted diffs are still escaped Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12521 See merge request !2544 | ||||
| | * | | Make sure non-highlighted diffs are still escapedunescaped-diffs | Douwe Maan | 2016-01-22 | 2 | -3/+9 |
| | |/ | |||||
| * | | Merge branch 'ci/recursive-artifacts-entries' into 'master' | Robert Speicher | 2016-01-21 | 2 | -5/+5 |
| |\ \ | | | | | | | | | | | | | 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-entries | Kamil Trzcinski | 2016-01-20 | 2 | -5/+5 |
| | | | | |||||
| * | | | Merge branch 'diff-highlight-themes' into 'master' | Robert Speicher | 2016-01-21 | 21 | -268/+237 |
| |\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Diff highlight themes Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12484 See merge request !2530 | ||||
| | * | | Make dark inline diffs a little more obviousdiff-highlight-themes | Douwe Maan | 2016-01-21 | 1 | -2/+2 |
| | | | | |||||
| | * | | Pretty highlighted diffs for every theme | Douwe Maan | 2016-01-21 | 5 | -20/+37 |
| | | | | |||||
| | * | | Use consistent markup and styling for highlighting across blobs, diffs, ↵ | Douwe Maan | 2016-01-21 | 21 | -260/+212 |
| | | | | | | | | | | | | | blame and snippets | ||||
| * | | | Merge branch 'drag-drop-cursor' into 'master' | Jacob Schatz | 2016-01-21 | 1 | -0/+11 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Milestone drag & drop cursor Fixes #4097  cc @jschatz1 @creamzy See merge request !2532 | ||||
| | * | | | Milestone drag & drop cursor | Phil Hughes | 2016-01-21 | 1 | -0/+11 |
| | |/ / | | | | | | | | | | Fixes #4097 | ||||
| * | | | Merge branch 'fix/artifacts-download-progress-bar' into 'master' | Grzegorz Bizon | 2016-01-21 | 3 | -10/+17 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Do not use progress bar when downloading build artifacts Closes #12491 See merge request !2531 | ||||
| | * | | | Move build artifacts javascripts into separate filefix/artifacts-download-progress-bar | Grzegorz Bizon | 2016-01-21 | 3 | -13/+16 |
| | | | | | |||||
| | * | | | Do not use progress bar when downloading build artifacts | Grzegorz Bizon | 2016-01-21 | 1 | -1/+5 |
| | |/ / | | | | | | | | | | Closes #12491 | ||||
| * | | | remove execution permissions from fonts | Pirate Praveen | 2016-01-21 | 25 | -0/+0 |
| |/ / | |||||
| * | | Removes 100% width because it is a block element. | Jacob Schatz | 2016-01-20 | 1 | -1/+0 |
| | | | |||||
| * | | Implement new UI for pagination | Dmitriy Zaporozhets | 2016-01-20 | 7 | -53/+28 |
| | | | |||||
| * | | Merge branch 'ui-is-broken-in-search-result-page' into 'master' | Dmitriy Zaporozhets | 2016-01-21 | 1 | -4/+0 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix term height so text overflap does not happen. Fixes #12449 Height was set on the `.term`. It made the text overlap. See merge request !2518 | ||||
| | * | | Fix term height so text overflap does not happen.ui-is-broken-in-search-result-page | Jacob Schatz | 2016-01-20 | 1 | -4/+0 |
| | | | | |||||
| * | | | Merge branch 'fix-project-creation' into 'master' | Robert Speicher | 2016-01-20 | 2 | -2/+7 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creator should be added as a master of the project on creation Fixes #4222 This also enable a project creator to add themselves as a master of the project for existing repositories that were created in the meanwhile that they don't appear as members. See merge request !2520 | ||||
| | * | | | Creator should be added as a master of the project on creation | Douglas Barbosa Alexandre | 2016-01-20 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | This also enable a project creator to add themselves as a master of the project. | ||||
| * | | | | Merge branch ↵ | Dmitriy Zaporozhets | 2016-01-20 | 2 | -0/+46 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'show-message-to-signed-out-users-to-sign-in-if-they-want-to-comment' into 'master' Adds disabled comment field and disabled avatar. Fixes #3540  See merge request !2508 | ||||
| | * | | | | Uses color variables instead.show-message-to-signed-out-users-to-sign-in-if-they-want-to-comment | Jacob Schatz | 2016-01-20 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | Adds disabled comment field and disabled avatar. | Jacob Schatz | 2016-01-20 | 2 | -0/+46 |
| | |/ / / | |||||
| * | | | | Merge branch 'master' into issue_3945issue_3945 | Rubén Dávila | 2016-01-20 | 4 | -0/+25 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'feature/check-against-rbl-only' into 'master' | Robert Speicher | 2016-01-20 | 4 | -0/+25 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split from !2455 References #9092 See merge request !2515 | ||||
| | | * | | | | Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-only | Tomasz Maczukin | 2016-01-20 | 4 | -0/+25 |
| | | |/ / / | |||||
| * | | | | | Merge branch 'master' into issue_3945 | Douwe Maan | 2016-01-20 | 14 | -22/+52 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge branch 'sentry-integration' into 'master' | Robert Speicher | 2016-01-20 | 4 | -1/+39 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-integration | Douwe Maan | 2016-01-20 | 1 | -2/+2 |
| | | | | | | | |||||
| | | * | | | | Send user context to Sentry | Douwe Maan | 2016-01-20 | 1 | -0/+11 |
| | | | | | | | |||||
| | | * | | | | Use sentry in env production only | Jeroen Nijhof | 2016-01-20 | 1 | -1/+3 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵ | Jeroen Nijhof | 2016-01-20 | 24 | -65/+131 |
| | | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sentry-integration Conflicts: db/schema.rb | ||||
| | | * | | | | Add sentry integration | Jeroen Nijhof | 2016-01-18 | 3 | -0/+25 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'awardemoji-tooltip-shows-people-multiple-times' into 'master' | Dmitriy Zaporozhets | 2016-01-20 | 1 | -10/+7 |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes tooltip doesn't duplicate the "me" name. Checks that "me" is not in the array of names in tooltip  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-times | Jacob Schatz | 2016-01-19 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Fix the situation where the user has named themselves "me" | Jacob Schatz | 2016-01-18 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Stopped looking for existing user since remove functionality is fixed. | ||||
| | | * | | | | Fix underlying issue with emoji reactions | Jacob Schatz | 2016-01-18 | 1 | -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 Schatz | 2016-01-18 | 1 | -1/+2 |
| | | | | | | | |||||
| | | * | | | | Fixes tooltip doesn't duplicate the "me" name. | Jacob Schatz | 2016-01-18 | 1 | -8/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Checks that "me" is not in the array of names in tooltip | ||||
| | * | | | | | Merge branch 'secret-shortcut-feature' into 'master' | Dmitriy Zaporozhets | 2016-01-20 | 5 | -6/+5 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds "t" as a shortcut for find file anywhere See merge request !2507 | ||||
| | | * | | | | | Simplifies the HAML if statement for project branch URL | Jacob Schatz | 2016-01-20 | 1 | -6/+2 |
| | | | | | | | | |||||
| | | * | | | | | Fix HTML so code passessecret-shortcut-feature | Jacob Schatz | 2016-01-20 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code was failing because branch was named `'test'` with quotes which was escaping the javascript I was using. | ||||
| | | * | | | | | Fix project find url so branch ref is not nil | Jacob Schatz | 2016-01-19 | 2 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds autocomplete="off" to find input. | ||||
| | | * | | | | | Proper spacing in HAML file `if` statement. | Jacob Schatz | 2016-01-19 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Removes `defined?` in favor to just `if` | Jacob Schatz | 2016-01-19 | 1 | -1/+1 |
| | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |