summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'issue_2239' into 'master' Dmitriy Zaporozhets2016-01-221-0/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Provide a link for fetching merge requests from command line instructions Closes #2239 See merge request !2540
| | * | Add link for checkout MRs info.issue_2239Rubén Dávila2016-01-211-0/+4
| | | |
| * | | Merge branch 'fix-comment-on-diff-ajax-loading'Dmitriy Zaporozhets2016-01-224-7/+5
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/master' into ↵Rémy Coutable2016-01-208-8/+45
| | |\ \ \ | | | |/ / | | | | | | | | | | fix-comment-on-diff-ajax-loading
| | * | | Address some JS coding-style and HTML semantic issuesRémy Coutable2016-01-204-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replace 'rel' attributes with 'data' or 'id' attributes - Style jQuery methods chaining according to Jacob's guidelines - Rename a method
| * | | | Merge branch 'fix-error-500-mr-search' into 'master' Dmitriy Zaporozhets2016-01-221-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when doing a search for merge requests Potential fix for #11547 See merge request !2525
| | * | | | Fix Error 500 when doing a search for merge requestsStan Hu2016-01-201-1/+1
| | | |/ / | | |/| | | | | | | | | | | | Potential fix for #11547
| * | | | Merge branch 'fix-mr-diff-edit-button' into 'master' Robert Speicher2016-01-221-21/+19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-buttonDouwe Maan2016-01-211-21/+19
| | | | | |
| * | | | | Merge branch 'fix-diff-comments' into 'master' Robert Speicher2016-01-221-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | More highlighted diff fixes See merge request !2545
| | * | | | | Restore diff commentsDouwe Maan2016-01-221-1/+2
| | |/ / / /
| * | | | | Merge branch 'ci/recursive-artifacts-entries' into 'master' Robert Speicher2016-01-211-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-201-1/+1
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'diff-highlight-themes' into 'master' Robert Speicher2016-01-2110-60/+58
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff highlight themes Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12484 See merge request !2530
| | * | | | Use consistent markup and styling for highlighting across blobs, diffs, ↵Douwe Maan2016-01-2110-60/+58
| | | | | | | | | | | | | | | | | | | | | | | | blame and snippets
| * | | | | Move build artifacts javascripts into separate filefix/artifacts-download-progress-barGrzegorz Bizon2016-01-211-13/+0
| | | | | |
| * | | | | Do not use progress bar when downloading build artifactsGrzegorz Bizon2016-01-211-1/+5
| |/ / / / | | | | | | | | | | | | | | | Closes #12491
| * | | | Implement new UI for paginationDmitriy Zaporozhets2016-01-205-16/+14
| | | | |
| * | | | Merge branch ↵Dmitriy Zaporozhets2016-01-201-0/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| | * | | | Adds disabled comment field and disabled avatar.Jacob Schatz2016-01-201-0/+10
| | | |_|/ | | |/| |
| * | | | Merge branch 'master' into issue_3945issue_3945Rubén Dávila2016-01-201-0/+16
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'feature/check-against-rbl-only' into 'master'Robert Speicher2016-01-201-0/+16
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split from !2455 References #9092 See merge request !2515
| | | * | | Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-onlyTomasz Maczukin2016-01-201-0/+16
| | | |/ /
| * | | | Merge branch 'master' into issue_3945Douwe Maan2016-01-206-6/+24
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'sentry-integration' into 'master' Robert Speicher2016-01-201-1/+20
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | |
| | | * | | 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-206-21/+39
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sentry-integration Conflicts: db/schema.rb
| | | * | | Add sentry integrationJeroen Nijhof2016-01-181-0/+17
| | | | | |
| | * | | | Merge branch 'secret-shortcut-feature' into 'master' Dmitriy Zaporozhets2016-01-202-1/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-191-0/+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
| | | | | |
| * | | | | Fix MR diff_refsDouwe Maan2016-01-202-2/+2
| | | | | |
| * | | | | Merge branch 'master' into issue_3945Douwe Maan2016-01-2014-32/+50
| |\ \ \ \ \ | | |/ / / /
| * | | | | Move parallel diff logic to separate classDouwe Maan2016-01-203-5/+5
| | | | | |
| * | | | | Refactor Gitlab::Highlight and fix testsDouwe Maan2016-01-192-4/+4
| | | | | |
| * | | | | Merge branch 'master' into issue_3945Rubén Dávila2016-01-14136-649/+869
| |\ \ \ \ \
| * | | | | | More refactoring from last code review. #3945Rubén Dávila2016-01-143-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-142-3/+3
| | | | | | |
| * | | | | | Refactor parallel_diff generation a bit.Douwe Maan2016-01-141-25/+18
| | | | | | |
| * | | | | | Little refactor for usage of html_safe. #3945Rubén Dávila2016-01-132-3/+3
| | | | | | |
| * | | | | | Use html_safe instead of raw. #3945Rubén Dávila2016-01-131-2/+2
| | | | | | |
| * | | | | | Make diff_line_content helper return a safe String. #3945Rubén Dávila2016-01-123-3/+3
| | | | | | |
View Lorry Controller Status