| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'fix-moving-revert-button' into 'master' | Jacob Schatz | 2016-02-22 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | Fixed revert button tooltip placement causing movement Before:  After:  See merge request !2910 | ||||
| | * | Fixed revert button tooltip placement causing movementfix-moving-revert-button | Phil Hughes | 2016-02-22 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'issue_13463' into 'master' | Jacob Schatz | 2016-02-22 | 2 | -1/+2 |
| |\ \ | |/ |/| | | | | | | | | | Fix Side-by-side view after loading diff results Fixes #13463 See merge request !2880 | ||||
| | * | Fixes syntax error | Alfredo Sumaran | 2016-02-19 | 1 | -1/+1 |
| | | | |||||
| | * | Make diff view name getter less error prone | Alfredo Sumaran | 2016-02-19 | 1 | -1/+1 |
| | | | |||||
| | * | Add missing class to builds page | Alfredo Sumaran | 2016-02-18 | 1 | -0/+1 |
| | | | |||||
| * | | "X assigned you Y" instead of "X assigned Y" | Douwe Maan | 2016-02-20 | 1 | -0/+7 |
| | | | |||||
| * | | Add "Mark all as done" button | Douwe Maan | 2016-02-20 | 1 | -0/+26 |
| | | | |||||
| * | | Include 'issue'/'merge request' in link | Douwe Maan | 2016-02-20 | 1 | -8/+3 |
| | | | |||||
| * | | Rename Tasks to Todos | Douglas Barbosa Alexandre | 2016-02-20 | 2 | -69/+59 |
| | | | |||||
| * | | Refactoring TasksHelper | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -8/+1 |
| | | | |||||
| * | | Refactoring task queue partials | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -5/+7 |
| | | | |||||
| * | | Fix rubocop offenses | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -1/+1 |
| | | | |||||
| * | | Add filters by project, author, type, and action to task queue page list | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -0/+33 |
| | | | |||||
| * | | Create a pending task when a user is mentioned on a note | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -0/+16 |
| | | | |||||
| * | | Add pending tasks badge on top right next to the new and logout button | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -0/+8 |
| | | | |||||
| * | | Add tasks queue list page | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -0/+17 |
| | | | |||||
| * | | Merge branch 'rs-blob' into 'master' | Douwe Maan | 2016-02-20 | 1 | -4/+0 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `Blob` model that wraps `Gitlab::Git::Blob` This allows us to take advantage of Rails' `to_partial_path` to render the correct partial based on the Blob type, rather than cluttering the view with conditionals. It also allows (and will allow in the future) better encapsulation for Blob-related logic which makes sense for our Rails app but might not make as much sense for the core `gitlab_git` library, such as detecting if the blob is an SVG. See merge request !2887 | ||||
| | * | | Add a `Blob` model that wraps `Gitlab::Git::Blob`rs-blob | Robert Speicher | 2016-02-18 | 1 | -4/+0 |
| | |/ | | | | | | | | | | | | | | | | | | | | | This allows us to take advantage of Rails' `to_partial_path` to render the correct partial based on the Blob type, rather than cluttering the view with conditionals. It also allows (and will allow in the future) better encapsulation for Blob-related logic which makes sense for our Rails app but might not make as much sense for the core `gitlab_git` library, such as detecting if the blob is an SVG. | ||||
| * | | Some updates from last code review. | Rubén Dávila | 2016-02-19 | 1 | -2/+2 |
| | | | |||||
| * | | Make #commit_with_hooks return the new obj id plus some other fixes. | Rubén Dávila | 2016-02-19 | 1 | -4/+14 |
| | | | |||||
| * | | Refactor revert_commit_link helper. | Rubén Dávila | 2016-02-19 | 2 | -8/+2 |
| | | | |||||
| * | | No longer need to ignore temporary branch. | Rubén Dávila | 2016-02-19 | 1 | -2/+0 |
| | | | | | | | | | | | * Now it's only created when user choose to create a MR and logic to hide it is handled by https://gitlab.com/gitlab-org/gitlab-ce/blob/50595af7b0e304f16e2955109abd2d25cd96efda/app/helpers/application_helper.rb#L139 | ||||
| * | | Fix build and add specs | Rubén Dávila | 2016-02-19 | 1 | -7/+4 |
| | | | |||||
| * | | Show a tooltip on revert link. | Rubén Dávila | 2016-02-19 | 1 | -7/+5 |
| | | | |||||
| * | | Move revert link to the MR widget section plus some refactor. | Rubén Dávila | 2016-02-19 | 1 | -2/+2 |
| | | | |||||
| * | | Some fixes and refactors for code related to forks. | Rubén Dávila | 2016-02-19 | 1 | -0/+2 |
| | | | |||||
| * | | Some updates after last code review. | Rubén Dávila | 2016-02-19 | 3 | -9/+24 |
| | | | |||||
| * | | Add link to fork if user can't revert MR. | Rubén Dávila | 2016-02-19 | 1 | -0/+7 |
| | | | |||||
| * | | Add button to revert commit on Commit detail page. | Rubén Dávila | 2016-02-19 | 1 | -0/+7 |
| | | | |||||
| * | | Some updates from last code review. | Rubén Dávila | 2016-02-19 | 1 | -1/+1 |
| | | | |||||
| * | | Don't show last event message on top when reverse branch was created under ↵ | Rubén Dávila | 2016-02-19 | 1 | -0/+2 |
| | | | | | | | | | the hood. | ||||
| * | | Merge branch 'rs-emoji' into 'master' | Douwe Maan | 2016-02-19 | 1 | -6/+0 |
| |\ \ | |/ |/| | | | | | | | | | | | | | Update Gemojione for new hotness :sparkles: Before | After ------ | -----  |  See merge request !2800 | ||||
| | * | Remove unused emoji_autocomplete_source helper | Robert Speicher | 2016-02-12 | 1 | -6/+0 |
| | | | |||||
| * | | Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master' | Douwe Maan | 2016-02-17 | 1 | -0/+18 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to see and sort on vote count from Issues and MR lists Fixes #3763 * Sort options  * Most popular  * Least popular  See merge request !2781 | ||||
| | * | | Add ability to see and sort on vote count from Issues and MR listssee-and-sort-on-vote-count-mr-issues | Douglas Barbosa Alexandre | 2016-02-17 | 1 | -0/+18 |
| | | | | |||||
| * | | | Sort line notes used in parallel diff by created_at | Rémy Coutable | 2016-02-17 | 1 | -1/+1 |
| |/ / | | | | | | | Fixes #13464. | ||||
| * | | Display "iid of max_iid" in Issuables' sidebar | Rémy Coutable | 2016-02-16 | 1 | -8/+4 |
| | | | |||||
| * | | Fix the "x of y" displayed at the top of Issuables' sidebarfix/13356-issuable-index-of-total-in-sidebar | Rémy Coutable | 2016-02-15 | 3 | -85/+44 |
| | | | | | | | | | | | | | | | | | 1. We now display the index of the current issuable among all its project's issuables, of the same type and with the same state. 2. Also, refactored a bit the Issuable helpers into a new IssuablesHelper module. 3. Added acceptance specs for the sidebar counter. | ||||
| * | | Fix relative links in other markup formatsben.boeckel/gitlab-ce-fixup-links-in-generic-docs | Ben Boeckel | 2016-02-12 | 2 | -2/+16 |
| |/ | | | | | | | | - Apply the RelativeLinkFilter filter to other formats, e.g., reStructuredText so links from the Files view or the Project view work - Remove the AsciidocPipeline pipeline Fixes #3533. | ||||
| * | Fix milestone order in project and issue edit lists to due_dateolirogers/gitlab-ce-project-milestone-order | Oliver Rogers | 2016-02-10 | 2 | -7/+3 |
| | | |||||
| * | Merge remote-tracking branch 'dev/master' into 'master' | Robert Speicher | 2016-02-09 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'ci-permissions' into 'master' | Robert Speicher | 2016-02-08 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | | | | | | | Limit guest access to builds Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2646 See merge request !1942 | ||||
| | | * | Merge branch 'master' into ci-permissions | Kamil Trzcinski | 2016-02-05 | 4 | -15/+109 |
| | | |\ | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| | | * \ | Merge remote-tracking branch 'origin/master' into ci-permissions | Kamil Trzcinski | 2016-02-04 | 4 | -7/+31 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/builds/index.html.haml | ||||
| | | * | | | Make the CI permission model simpler | Kamil Trzcinski | 2016-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR simplifies CI permission model: - read_build: allows to read a list of builds, artifacts and trace - update_build: allows to cancel and retry builds - create_build: allows to create builds from gitlab-ci.yml (not yet implemented) - admin_build: allows to manage triggers, runners and variables - read_commit_status: allows to read a list of commit statuses (including the overall of builds) - create_commit_status: allows to create a new commit status using API Remove all extra methods to manage permission. Made all controllers to use explicitly the new permissions. | ||||
| * | | | | | Merge branch 'rs-broadcast-markdown' into 'master' | Douwe Maan | 2016-02-09 | 1 | -1/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow limited Markdown in Broadcast Messages Closes #11853 See merge request !2695 | ||||
| | * | | | | | Allow limited Markdown in Broadcast Messagesrs-broadcast-markdown | Robert Speicher | 2016-02-06 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Closes #11853 | ||||
| * | | | | | | Merge branch 'snippet_search_refactoring' | Valery Sizov | 2016-02-09 | 1 | -3/+3 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| | * | | | | | Faster snippet search | Valery Sizov | 2016-02-05 | 1 | -3/+3 |
| | | |_|_|/ | |/| | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |