summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Make sure non-highlighted diffs are still escapedunescaped-diffsDouwe Maan2016-01-222-3/+9
|
* Merge branch 'drag-drop-cursor' into 'master' Jacob Schatz2016-01-211-0/+11
|\ | | | | | | | | | | | | | | | | | | | | Milestone drag & drop cursor Fixes #4097 ![grab-cursor](/uploads/f5071d7e4839c3b4b88c9f7f1270eee3/grab-cursor.gif) cc @jschatz1 @creamzy See merge request !2532
| * Milestone drag & drop cursorPhil Hughes2016-01-211-0/+11
| | | | | | | | Fixes #4097
* | Merge branch 'fix/artifacts-download-progress-bar' into 'master' Grzegorz Bizon2016-01-213-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-barGrzegorz Bizon2016-01-213-13/+16
| | |
| * | Do not use progress bar when downloading build artifactsGrzegorz Bizon2016-01-211-1/+5
| |/ | | | | | | Closes #12491
* | remove execution permissions from fontsPirate Praveen2016-01-2125-0/+0
|/
* Removes 100% width because it is a block element.Jacob Schatz2016-01-201-1/+0
|
* Implement new UI for paginationDmitriy Zaporozhets2016-01-207-53/+28
|
* Merge branch 'ui-is-broken-in-search-result-page' into 'master' Dmitriy Zaporozhets2016-01-211-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-pageJacob Schatz2016-01-201-4/+0
| |
* | Merge branch 'fix-project-creation' into 'master' Robert Speicher2016-01-202-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 creationDouglas Barbosa Alexandre2016-01-202-2/+7
| | | | | | | | | | | | | | | This also enable a project creator to add themselves as a master of the project.
* | | Merge branch ↵Dmitriy Zaporozhets2016-01-202-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 ![Screen_Shot_2016-01-20_at_12.13.29_AM](/uploads/673fb783e9aeae441df9c40bfe29ac1b/Screen_Shot_2016-01-20_at_12.13.29_AM.png) See merge request !2508
| * | | Uses color variables instead.show-message-to-signed-out-users-to-sign-in-if-they-want-to-commentJacob Schatz2016-01-201-3/+3
| | | |
| * | | Adds disabled comment field and disabled avatar.Jacob Schatz2016-01-202-0/+46
| |/ /
* | | Merge branch 'master' into issue_3945issue_3945Rubén Dávila2016-01-204-0/+25
|\ \ \
| * \ \ Merge branch 'feature/check-against-rbl-only' into 'master'Robert Speicher2016-01-204-0/+25
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split from !2455 References #9092 See merge request !2515
| | * | | Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-onlyTomasz Maczukin2016-01-204-0/+25
| | |/ /
* | | | Merge branch 'master' into issue_3945Douwe Maan2016-01-2014-22/+52
|\ \ \ \ | |/ / /
| * | | Merge branch 'sentry-integration' into 'master' Robert Speicher2016-01-204-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-integrationDouwe Maan2016-01-201-2/+2
| | | | |
| | * | | Send user context to SentryDouwe Maan2016-01-201-0/+11
| | | | |
| | * | | Use sentry in env production onlyJeroen Nijhof2016-01-201-1/+3
| | | | |
| | * | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jeroen Nijhof2016-01-2024-65/+131
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | sentry-integration Conflicts: db/schema.rb
| | * | | Add sentry integrationJeroen Nijhof2016-01-183-0/+25
| | | | |
| * | | | 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-205-6/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | 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 'issue_3749' into 'master' Douwe Maan2016-01-201-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Issues/MRs updated_at field when notes are generated Closes #3749 and #9130 See merge request !2493
| | * | | | | Update Issue/MR everytime a Note is saved/destroyed.Rubén Dávila2016-01-192-5/+2
| | | | | | |
| | * | | | | Check if object respond to #touch before update.Rubén Dávila2016-01-181-1/+2
| | | | | | |
| | * | | | | Update Issues/MRs updated_at when user leaves comments.Rubén Dávila2016-01-181-1/+3
| | | |_|/ / | | |/| | |
| * | | | | Remove `Compressed to` column from build artifacts browserci/artifacts-remove-compressed-sizeGrzegorz Bizon2016-01-203-4/+0
| | |_|_|/ | |/| | | | | | | | | | | | | See #10982.
* | | | | Properly highlight lines around '\ No newline at end of file'Douwe Maan2016-01-202-0/+9
| | | | |
* | | | | Save and use actual diff base commit for MR diff highlightingDouwe Maan2016-01-205-9/+30
| | | | |
* | | | | Fix MR diff_refsDouwe Maan2016-01-203-4/+4
| | | | |
* | | | | Restore helperDouwe Maan2016-01-201-0/+4
| | | | |
* | | | | Merge branch 'master' into issue_3945Douwe Maan2016-01-2072-122/+244
|\ \ \ \ \ | |/ / / /