| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffs | Jacob Vosmaer | 2016-03-03 | 4 | -3/+40 |
| |\ | |||||
| | * | audit log UI update | Phil Hughes | 2016-03-02 | 1 | -1/+10 |
| | | | | | | | | | Closes #13862 | ||||
| | * | Little refactor for milestone_remaining_days helper from last code review.issue_13623 | Rubén Dávila | 2016-03-01 | 1 | -4/+3 |
| | | | |||||
| | * | Show days remaining instead of elapsed time for Milestone. | Rubén Dávila | 2016-03-01 | 1 | -0/+11 |
| | | | |||||
| | * | Merge branch 'mr-prefix-activity-view' into 'master' | Jacob Schatz | 2016-03-01 | 1 | -2/+2 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Changed # to ! on merge requests on activity view Closes #9082  See merge request !2938 | ||||
| | | * | Removed un-used variables | Phil Hughes | 2016-03-01 | 1 | -2/+0 |
| | | | | |||||
| | | * | Replaced prefix with to_reference method calls | Phil Hughes | 2016-03-01 | 1 | -8/+3 |
| | | | | |||||
| | | * | Changed # to ! on merge requests on activity view | Phil Hughes | 2016-03-01 | 1 | -2/+9 |
| | | | | | | | | | | | | | Closes #9082 | ||||
| | * | | Merge branch 'safe-content-type' into 'master' | Douwe Maan | 2016-03-01 | 1 | -0/+18 |
| | |\ \ | | |/ | |/| | | | | | | | | | | | | | Explain why we mangle blob content types Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/9079 See merge request !2956 | ||||
| | | * | Explain why we mangle blob content typessafe-content-type | Jacob Vosmaer | 2016-02-24 | 1 | -0/+18 |
| | | | | |||||
| * | | | Rename DiffCollection#map! to #decorate! | Jacob Vosmaer | 2016-03-02 | 1 | -2/+1 |
| | | | | |||||
| * | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffs | Jacob Vosmaer | 2016-03-01 | 2 | -8/+24 |
| |\ \ \ | |/ / | |||||
| | * | | Branded login page also in CE11489-branded-appearance-to-ce | Zeger-Jan van de Weg | 2016-02-26 | 1 | -8/+20 |
| | | | | | | | | | | | | | | | | The only major difference with the EE version is the change from a light and dark logo to only a header logo The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it | ||||
| | * | | Move "I should see Crowd login form" feature to a view specrs-crowd-form-view-spec | Robert Speicher | 2016-02-24 | 1 | -0/+4 |
| | |/ | | | | | | | | | | | | | | | We were doing all kinds of code gymnastics to "enable" Crowd in the feature spec and this would sometimes cause a transient failure. Really what it's testing is if the Crowd login form shows when Crowd's enabled, so this is much better suited to a view spec. | ||||
| * | | Make #diffs safe (limited) by default | Jacob Vosmaer | 2016-02-29 | 1 | -3/+2 |
| | | | |||||
| * | | Rubocop | Jacob Vosmaer | 2016-02-26 | 1 | -1/+1 |
| | | | |||||
| * | | Move diff options around | Jacob Vosmaer | 2016-02-26 | 1 | -10/+3 |
| | | | |||||
| * | | Make more use of DiffHelper | Jacob Vosmaer | 2016-02-26 | 1 | -27/+16 |
| | | | |||||
| * | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffs | Jacob Vosmaer | 2016-02-25 | 16 | -47/+238 |
| |\ \ | |/ | |||||
| | * | 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 |
| | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |