| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'issue_13301_emoji-menu' into 'master' | Robert Speicher | 2016-02-24 | 1 | -0/+6 |
| |\ | | | | | | | | | | | | | Load award emoji picker with ajax request Fixes #13301. See merge request !2888 | ||||
| | * | Update award_emoji test | Annabel Dunstone | 2016-02-23 | 1 | -1/+2 |
| | | | |||||
| | * | Create EmojisController | Annabel Dunstone | 2016-02-22 | 2 | -4/+5 |
| | | | |||||
| | * | Load award emoji picker with ajax request | Annabel Dunstone | 2016-02-18 | 1 | -0/+4 |
| | | | |||||
| * | | Merge branch 'fix-todos' into 'master' | Robert Speicher | 2016-02-23 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | Does not raise an error when Todo is already marked as done Closes #13681 See merge request !2926 | ||||
| | * | | Does not raise an error when Todo is already marked as done | Douglas Barbosa Alexandre | 2016-02-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Correctly checks if tree view is on screen | Phil Hughes | 2016-02-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixes issue with file view rows not clickable on project main viewfiles-view-row-click | Phil Hughes | 2016-02-23 | 1 | -3/+3 |
| |/ / | | | | | | | | | | | | | Fixed an issue where it would only load the first 25 commit data on project main view Stopped the file view sending 1 too many requests Fixes #3916 | ||||
| * | | Use before_action instead of before_filter | Douglas Barbosa Alexandre | 2016-02-21 | 1 | -1/+1 |
| | | | |||||
| * | | Add "Mark all as done" button | Douwe Maan | 2016-02-20 | 1 | -1/+15 |
| | | | |||||
| * | | Fix rubucop offenses | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -2/+0 |
| | | | |||||
| * | | Rename Tasks to Todos | Douglas Barbosa Alexandre | 2016-02-20 | 3 | -22/+24 |
| | | | |||||
| * | | Create or mark task pending as soon the action happens | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -0/+2 |
| | | | |||||
| * | | Add filters by project, author, type, and action to task queue page list | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -7/+1 |
| | | | |||||
| * | | Fix rubocop offenses | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -5/+5 |
| | | | |||||
| * | | Remove task abilities, since we will only ever show the user their own | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -8/+0 |
| | | | |||||
| * | | Add pending tasks badge on top right next to the new and logout button | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -3/+0 |
| | | | |||||
| * | | Allow user to mark each task as done manually | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -0/+23 |
| | | | |||||
| * | | Add tasks queue list page | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -0/+15 |
| | | | |||||
| * | | Merge branch 'visibletrap/gitlab-ce-label' | Douwe Maan | 2016-02-19 | 6 | -2/+9 |
| |\ \ | |||||
| | * | | Find label in issues_finder | Tap | 2016-02-19 | 2 | -2/+2 |
| | | | | |||||
| | * | | Label description and Label row | Tap | 2016-02-17 | 6 | -2/+9 |
| | | | | | | | | | | | | | | | | - Add label description - Show label row when filtering issues or merge requests by label | ||||
| * | | | Merge branch 'rs-blob' into 'master' | Douwe Maan | 2016-02-20 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | Merge branch 'issue_3276' into 'master' | Jacob Schatz | 2016-02-19 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Labels should be visible in milestone view Closes #3276 See merge request !2599 | ||||
| | * | | | | Add labels tab to milestone detail view. | Rubén Dávila | 2016-02-02 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Use the adequate success path on the JSON endpoint. | Rubén Dávila | 2016-02-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | I forgot to update this and some spinach specs were failing. | ||||
| * | | | | | More updates from the last code review. | Rubén Dávila | 2016-02-19 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Fix build and add specs | Rubén Dávila | 2016-02-19 | 3 | -10/+11 |
| | | | | | | |||||
| * | | | | | Some updates after last code review. | Rubén Dávila | 2016-02-19 | 2 | -15/+35 |
| | | | | | | |||||
| * | | | | | Add link to fork if user can't revert MR. | Rubén Dávila | 2016-02-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Remove code introduced when endpoint was in MR controller. | Rubén Dávila | 2016-02-19 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Update copy and URLs used when reverting MRs. | Rubén Dávila | 2016-02-19 | 1 | -3/+23 |
| | | | | | | |||||
| * | | | | | Check that target_branch is present. | Rubén Dávila | 2016-02-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Reuser revert commit modal in MR detail page. | Rubén Dávila | 2016-02-19 | 1 | -21/+0 |
| | | | | | | |||||
| * | | | | | Make MRs with revert commit work. | Rubén Dávila | 2016-02-19 | 2 | -5/+19 |
| | | | | | | |||||
| * | | | | | Add RevertService class with basic logic to revert commit | Rubén Dávila | 2016-02-19 | 1 | -0/+13 |
| | | | | | | |||||
| * | | | | | 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 | -11/+11 |
| | | | | | | |||||
| * | | | | | Add some specs plus some refactor. | Rubén Dávila | 2016-02-19 | 1 | -2/+4 |
| | | | | | | |||||
| * | | | | | Explain why MR can't be reverted. | Rubén Dávila | 2016-02-19 | 1 | -8/+8 |
| | | | | | | |||||
| * | | | | | Use adequate description for new MR. | Rubén Dávila | 2016-02-19 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Check target branch exists before creating revert MR. | Rubén Dávila | 2016-02-19 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Some refactor to the revert commit creation. | Rubén Dávila | 2016-02-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | * Not required to run hooks since it's an internal commit | ||||
| * | | | | | Save merge commit id when MR is merged | Rubén Dávila | 2016-02-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Create reverse branch and generate MR with new branch. #3409 | Rubén Dávila | 2016-02-19 | 1 | -2/+12 |
| | | | | | | |||||
| * | | | | | Add new endpoint and button to revert merge. #3409 | Rubén Dávila | 2016-02-19 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | Merge branch 'ci/remove-builds' into 'master' | Grzegorz Bizon | 2016-02-19 | 1 | -0/+6 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to erase build content (artifacts, trace) This feature makes it possible to remove build content - build artifacts and build traces. - [x] Remove artifacts - [x] Remove metadata - [x] Remove build traces - [x] Wait for https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 this to be merged - [x] Fix the permissions after the merge Closes #3421 See merge request !2560 | ||||
| | * | | | | | Move build erasable implementation from concern to model | Grzegorz Bizon | 2016-02-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2560#note_3659905 | ||||
| | * | | | | | Update relevant build fields when build is erased | Grzegorz Bizon | 2016-02-19 | 1 | -1/+1 |
| | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |