Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Improve performance of the cycle analytics page. | Timothy Andrew | 2016-09-15 | 1 | -0/+15 |
* | Merge remote-tracking branch 'origin/master' into 21170-cycle-analytics | Timothy Andrew | 2016-09-07 | 1 | -19/+24 |
|\ | |||||
| * | Merge branch 'refactor/add-policies' into 'master' | Robert Speicher | 2016-08-31 | 1 | -1/+1 |
| |\ | |||||
| | * | remove Ability.abilities | http://jneen.net/ | 2016-08-30 | 1 | -1/+1 |
| * | | Merge branch 'remove-fishy-smell' into 'master' | Douwe Maan | 2016-08-31 | 1 | -2/+2 |
| |\ \ | | |/ | |/| | |||||
| | * | Allow setting branch refs for MRremove-fishy-smell | Sean McGivern | 2016-08-25 | 1 | -2/+2 |
| * | | Merge branch 'artifacts-from-ref-and-build-name' into 'master' | Douwe Maan | 2016-08-30 | 1 | -1/+3 |
| |\ \ | |||||
| | * \ | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu... | Lin Jen-Shin | 2016-08-26 | 1 | -21/+46 |
| | |\ \ | |||||
| | * \ \ | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu... | Lin Jen-Shin | 2016-08-19 | 1 | -0/+26 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu... | Lin Jen-Shin | 2016-08-18 | 1 | -2/+35 |
| | |\ \ \ | |||||
| | * | | | | An empty line after guard, feedback: | Lin Jen-Shin | 2016-08-16 | 1 | -0/+1 |
| | * | | | | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu... | Lin Jen-Shin | 2016-08-16 | 1 | -0/+9 |
| | |\ \ \ \ | |||||
| | * | | | | | Reverse ref and sha in args and rename pipeline to pipeline_for | Lin Jen-Shin | 2016-08-11 | 1 | -1/+2 |
| * | | | | | | Change method name | Katarzyna Kobierska | 2016-08-30 | 1 | -3/+3 |
| * | | | | | | Improve grammar and fix CHANGELOG | Katarzyna Kobierska | 2016-08-30 | 1 | -1/+1 |
| * | | | | | | User can edit closed MR with deleted fork | Katarzyna Kobierska | 2016-08-30 | 1 | -15/+18 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Add the "Code" Cycle Analytics section. | Timothy Andrew | 2016-08-26 | 1 | -0/+8 |
|/ / / / / | |||||
* | | | | | Merge branch '21275-getting-500-error-when-viewing-a-merge-request' | Douwe Maan | 2016-08-25 | 1 | -2/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Don't show conflicts when there are none | Sean McGivern | 2016-08-25 | 1 | -1/+5 |
| * | | | | | Handle case where conflicts aren't on disk yet | Sean McGivern | 2016-08-25 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Restore diff_sha_refs method | Dmitriy Zaporozhets | 2016-08-22 | 1 | -15/+16 |
* | | | | | Merge branch 'master' into dz-merge-request-version | Dmitriy Zaporozhets | 2016-08-19 | 1 | -2/+69 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Improve performance of MR show page | Douwe Maan | 2016-08-18 | 1 | -1/+1 |
| * | | | | Merge branch 'master' into diff-line-comment-vuejs | Connor Shea | 2016-08-17 | 1 | -2/+35 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge branch 'mc-ui' | Douwe Maan | 2016-08-17 | 1 | -2/+24 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch 'master' into mc-ui | Douwe Maan | 2016-08-15 | 1 | -0/+8 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | * | | | Verify user is signed in and can actually resolve conflicts | Douwe Maan | 2016-08-12 | 1 | -0/+5 |
| | | * | | | Rename `can_resolve_conflicts_in_ui?` to `conflicts_can_be_resolved_in_ui?` | Douwe Maan | 2016-08-12 | 1 | -5/+7 |
| | | * | | | Don't allow resolving invalid conflicts | Sean McGivern | 2016-08-12 | 1 | -4/+19 |
| | | * | | | Fix merge conflict reading for new diffs | Sean McGivern | 2016-08-12 | 1 | -2/+2 |
| | * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18681-pipelines... | Kamil Trzcinski | 2016-08-16 | 1 | -5/+37 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | * | | | | Properly select a list of Pipelines for a Merge Requests | Kamil Trzcinski | 2016-08-12 | 1 | -0/+11 |
| * | | | | | Store discussion_id on Note for faster discussion lookup. | Douwe Maan | 2016-08-17 | 1 | -4/+11 |
| * | | | | | Merge branch 'master' into diff-line-comment-vuejs | Connor Shea | 2016-08-16 | 1 | -0/+8 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge branch 'zj-deployment-status-on-mr' into 'master' | Douwe Maan | 2016-08-15 | 1 | -0/+8 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | Method names changed to #includes_commit?zj-deployment-status-on-mr | Z.J. van de Weg | 2016-08-12 | 1 | -1/+3 |
| | | * | | | Incorporate feedback | Z.J. van de Weg | 2016-08-11 | 1 | -1/+1 |
| | | * | | | Show deployment status on a MR view | Z.J. van de Weg | 2016-08-11 | 1 | -0/+6 |
| | | | |/ | | | |/| | |||||
| * | | | | Merge branch 'master' into diff-line-comment-vuejs | Douwe Maan | 2016-08-12 | 1 | -0/+1 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Add specs for NotesController and DiscussionsController | Douwe Maan | 2016-08-12 | 1 | -0/+4 |
| * | | | | Merge branch 'master' into diff-line-comment-vuejs | Douwe Maan | 2016-08-03 | 1 | -5/+28 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Use correct user for 'Discussion resolved by...' | Douwe Maan | 2016-07-28 | 1 | -3/+6 |
| * | | | | Add 'Resolved all discussions' system note | Douwe Maan | 2016-07-28 | 1 | -0/+5 |
| * | | | | Add endpoints to resolve diff notes and discussions | Douwe Maan | 2016-07-25 | 1 | -0/+7 |
| | |_|/ | |/| | | |||||
* | | | | Fix and refactor merge request diff_refs method | Dmitriy Zaporozhets | 2016-08-15 | 1 | -15/+2 |
* | | | | Make merge request diff works with new FileCollection logic | Dmitriy Zaporozhets | 2016-08-15 | 1 | -3/+3 |
* | | | | Merge branch 'master' into dz-merge-request-version | Dmitriy Zaporozhets | 2016-08-15 | 1 | -3/+26 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | api for generating new merge request | Scott Le | 2016-08-11 | 1 | -0/+1 |
| | |/ | |/| | |||||
| * | | change the API on the merge_request_diff model from diffs -> raw_diffsuse-raw-diffs-for-merge-request-diffs | Paco Guzman | 2016-08-03 | 1 | -1/+1 |
| * | | Make Compare#diffs diff_options a regular argument | Douwe Maan | 2016-08-03 | 1 | -1/+1 |