Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into lazy-blobslazy-blobs | Jacob Vosmaer | 2016-02-02 | 1 | -1/+4 |
|\ | |||||
| * | Render sanitized SVG images | Stan Hu | 2016-02-01 | 1 | -1/+4 |
| | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9265 | ||||
* | | Move load command into _text partial | Jacob Vosmaer | 2016-02-02 | 2 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobs | Jacob Vosmaer | 2016-02-01 | 43 | -155/+207 |
|\ \ | |/ | |||||
| * | Mark inline difference between old and new paths when a file is renamed | Douwe Maan | 2016-01-29 | 1 | -9/+13 |
| | | |||||
| * | Merge branch 'highlight-blame' into 'master' | Robert Speicher | 2016-01-28 | 1 | -6/+4 |
| |\ | | | | | | | | | | | | | Fix highlighting in blame view. See merge request !2630 | ||||
| | * | Merge branch 'master' into highlight-blame | Douwe Maan | 2016-01-28 | 1 | -1/+1 |
| | |\ | |||||
| | * | | Move blame group logic to dedicated class | Douwe Maan | 2016-01-28 | 1 | -2/+2 |
| | | | | |||||
| | * | | Fix highlighting in blame view. | Douwe Maan | 2016-01-27 | 1 | -4/+2 |
| | | | | |||||
| * | | | Merge branch 'issue_2406' into 'master' | Dmitriy Zaporozhets | 2016-01-28 | 4 | -5/+63 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show list of forks for a given Project Closes #2406 See merge request !2376 | ||||
| | * | | | Refactor some CSS rules. | Rubén Dávila | 2016-01-20 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Some fixes from last code review. | Rubén Dávila | 2016-01-20 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Some CSS and sorting fixes. | Rubén Dávila | 2016-01-20 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Add icon for private forks notice. #2406 | Rubén Dávila | 2016-01-20 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Add ability to sort forks. #2406 | Rubén Dávila | 2016-01-20 | 1 | -4/+5 |
| | | | | | |||||
| | * | | | aligns menu at top on one row | Jacob Schatz | 2016-01-20 | 1 | -10/+10 |
| | | | | | |||||
| | * | | | WIP: Add sort dropdown. #2406 | Rubén Dávila | 2016-01-20 | 1 | -0/+20 |
| | | | | | |||||
| | * | | | Little update to copy and custom content for empty results. #2406 | Rubén Dávila | 2016-01-20 | 1 | -8/+13 |
| | | | | | |||||
| | * | | | Show last commit as description. #2406 | Rubén Dávila | 2016-01-20 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Add ability to filter by namespace. #2406 | Rubén Dávila | 2016-01-20 | 1 | -11/+17 |
| | | | | | |||||
| | * | | | Show forks counter on listing. #2406 | Rubén Dávila | 2016-01-20 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Add fork button and implement ability to distinguish between public and ↵ | Rubén Dávila | 2016-01-20 | 1 | -1/+22 |
| | | | | | | | | | | | | | | | | | | | | protected forks. #2406 | ||||
| | * | | | Use Project creator's avatar in fork listing. #2406 | Rubén Dávila | 2016-01-20 | 2 | -1/+4 |
| | | | | | |||||
| | * | | | Setup new fork link in sidebar and routes. #2406 | Rubén Dávila | 2016-01-20 | 4 | -6/+6 |
| | | | | | |||||
| * | | | | Removed sorted text from dropdowns | Phil Hughes | 2016-01-28 | 1 | -1/+1 |
| | |_|/ | |/| | | | | | | | | | | Closes #12796 | ||||
| * | | | Merge branch 'events-performance' into 'master' | Robert Speicher | 2016-01-27 | 1 | -1/+1 |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of retrieving last update times for events See 75195eefcca4cb3961986c90c8e837da02f30134 and https://gitlab.com/gitlab-org/gitlab-ce/issues/12415#note_3387317 for the juicy details. Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12415 See merge request !2613 | ||||
| | * | | Use Atom update times of the first eventevents-performance | Yorick Peterse | 2016-01-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By simply loading the first event from the already sorted set we save ourselves extra (slow) queries just to get the latest update timestamp. This removes the need for Event.latest_update_time and significantly reduces the time needed to build an Atom feed. Fixes gitlab-org/gitlab-ce#12415 | ||||
| * | | | Use generic method to checks if artifacts are available | Grzegorz Bizon | 2016-01-26 | 1 | -1/+1 |
| |/ / | |||||
| * | | Highlight note code and edit previewnote-highlighting | Douwe Maan | 2016-01-25 | 3 | -6/+6 |
| | | | |||||
| * | | Merge branch 'issuable-white-bg' into 'master' | Jacob Schatz | 2016-01-23 | 5 | -13/+12 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gray background from issue/mr/milestone background Fixes #6062 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @skyruler @creamzy See merge request !2573 | ||||
| | * | | Remove gray background from issue/mr/milestone backgroundissuable-white-bg | Dmitriy Zaporozhets | 2016-01-22 | 5 | -13/+12 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Fix UI for pages with panelsfix-ui-padding | Dmitriy Zaporozhets | 2016-01-22 | 3 | -4/+3 |
| |/ / | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Merge branch 'issue_2239' into 'master' | Dmitriy Zaporozhets | 2016-01-22 | 1 | -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_2239 | Rubén Dávila | 2016-01-21 | 1 | -0/+4 |
| | | | | |||||
| * | | | Merge branch 'fix-comment-on-diff-ajax-loading' | Dmitriy Zaporozhets | 2016-01-22 | 4 | -7/+5 |
| |\ \ \ | |||||
| | * \ \ | Merge remote-tracking branch 'origin/master' into ↵ | Rémy Coutable | 2016-01-20 | 4 | -5/+1 |
| | |\ \ \ | | | |/ / | | | | | | | | | | | fix-comment-on-diff-ajax-loading | ||||
| | * | | | Address some JS coding-style and HTML semantic issues | Rémy Coutable | 2016-01-20 | 4 | -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-mr-diff-edit-button' into 'master' | Robert Speicher | 2016-01-22 | 1 | -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-button | Douwe Maan | 2016-01-21 | 1 | -21/+19 |
| | | | | | |||||
| * | | | | 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 'ci/recursive-artifacts-entries' into 'master' | Robert Speicher | 2016-01-21 | 1 | -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-entries | Kamil Trzcinski | 2016-01-20 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'diff-highlight-themes' into 'master' | Robert Speicher | 2016-01-21 | 8 | -36/+36 |
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | 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 Maan | 2016-01-21 | 8 | -36/+36 |
| | | | | | | | | | | | | | | | | | | | | blame and snippets | ||||
| * | | | | Move build artifacts javascripts into separate filefix/artifacts-download-progress-bar | Grzegorz Bizon | 2016-01-21 | 1 | -13/+0 |
| | | | | | |||||
| * | | | | Do not use progress bar when downloading build artifacts | Grzegorz Bizon | 2016-01-21 | 1 | -1/+5 |
| |/ / / | | | | | | | | | | | | | Closes #12491 | ||||
| * | | | Implement new UI for pagination | Dmitriy Zaporozhets | 2016-01-20 | 2 | -10/+0 |
| | | | | |||||
| * | | | Merge branch ↵ | Dmitriy Zaporozhets | 2016-01-20 | 1 | -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  See merge request !2508 | ||||
| | * | | | Adds disabled comment field and disabled avatar. | Jacob Schatz | 2016-01-20 | 1 | -0/+10 |
| | |/ / |