Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests
AgeCommit message (Collapse)Author
2015-01-28Improve UX for widget if merge request can not be mergedDmitriy Zaporozhets
2015-01-23Merge branch 'disable-turbolink-on-ci-links' into 'master'Dmitriy Zaporozhets
Disable turbolink on links pointing out to CI services ### What does this MR do? This MR adds 'data-no-turbolink' attribute into all links pointing to CI services. ### Are there points in the code the reviewer needs to double check? No ### Why was this MR needed? In rare cases where gitlab and CI service is installed on the same host, turbolink will be used for links between those two. This may result in corrupted css and javascript. This change is harmless for installations that do not share the domain name for GitLab and CI system - in such case, all links modified are already pointing out outside of the domain so turbolink won't handle them. ### What are the relevant issue numbers / Feature requests? I consider this a small fix, no issue has been added. See merge request !305
2015-01-21Fix spinner icon to match othersDrew Blessing
2015-01-20Disable turbolink on links pointing out to ci servicesGitLab
2015-01-19Votes block has less priority than assignee/milestoneDmitriy Zaporozhets
2015-01-12Rename the checkbox css class to prevent it from being overwritten by the ↵Marin Jankovski
same named bootstrap class.
2015-01-10Make automerge via satelliteDmitriy Zaporozhets
2015-01-07Pass source project variable to commits list on MR pageDmitriy Zaporozhets
2015-01-05Merge branch 'create-merge-request-view' into 'master'Dmitriy Zaporozhets
Create merge request view Updated the create merge request view to use the horizontal form layout, and added tabs for commits and changes. Also updated commits layout to use the same as the projects commits layout. Screenshots: [Before](https://gitlab.com/uploads/stephanvl/gitlab-ce/892d1bf4c0/Screenshot_from_2014-12-29_20_33_19.png) - [After](https://gitlab.com/uploads/stephanvl/gitlab-ce/508b3100c7/Screenshot_from_2014-12-29_20_34_40.png) Fixes #923 See merge request !270
2014-12-30Improve accept mr widget UIDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-29Updated create merge request submit viewStephan van Leeuwen
Create merge request submit view now uses the same form layout as creating an issue. The commits view now uses the same layout as the project commits view The commits and diffs are now in separate tabs, as used in the merge request view
2014-12-29Updated merge request commits viewStephan van Leeuwen
The merge request commits tab now uses the same layout as used in the project commits view
2014-12-25Fix testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-25Improve issue/mr page for tabletsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-25Set of UI changes mostly for issue and merge requestDmitriy Zaporozhets
* return edit/close buttons to old position (right of title) * make 'Issue #1' header smaller * move mr commits to separate tab * change inline/side diff switcher to buttons from tabs * make issue sidebar start with dicsussion block Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-23Refactor issues and merge requests listsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-23One column issue/mr lists for projectDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-23Show issuable context labels as blocksDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-22Render MR diff full size of screenDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-22Fix issueable context update and fix testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-21Merge branch 'master' into sidebar-navDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/layouts/group.html.haml
2014-12-18Restyle issue/mr/milestone to new layoutDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-08Merge branch 'upstream-master' into markdown-previewVinnie Okada
Conflicts: spec/routing/project_routing_spec.rb
2014-12-07Merge branch 'small-fixes' into 'master'Dmitriy Zaporozhets
Small fixes Improve application stability over unexpected cases See merge request !1310
2014-12-05Prevent 500 on MR page if merge_event missingDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-05Move issues/mr filter to partialDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-05Automatically close merge requests that were locker for 1 dayDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-03Show issue/mr id in the list below titleDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-03Merge branch 'show-cross-project-ref' into 'master'Dmitriy Zaporozhets
Show cross project ref Fixes #1661 See merge request !1292
2014-12-03Add cross-project reference tooltip for merge requestDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-02UI improvements mostly for mobile screensDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-20Possibility to create Milestones or Labels when Issues are disabledValery Sizov
2014-11-10Merge branch 'better-mr-instructions' into 'master'Dmitriy Zaporozhets
Better merge request manual instructions I noticed the current instructions for manually merging a merge request that was submitted from a fork could create unnecessary merge requests or strange history. Imagine this: 1. Alice creates a repository and commits / pushes a single commit with SHA1 `A` to `master`. 2. Bob forks this repository and creates a new branch `myfeature` on `master` (`A`) 3. Alice commits `B` to `master` (which has the parent `A`) 4. Bob creates two commits on `myfeature` `P` and `Q`. 5. Bob submits the merge request to merge his `myfeature` into Alice's `master` branch. 6. Alice follows the manual merge request instructions: 1. `git checkout -b bob/repo-myfeature master` 2. `git pull http://... myfeature` The branch `bob/repo-myfeature` was created from Alice's current `master`, which was `B`. When the `pull` is executed, git will fetch Bob's branch and then merged the fetched branch `Q` into the current branch's location `B`. This creates an unnecessary merge commit from `master` into the branch Alice is trying to merge. No harm is done, but the history is a bit messier. This is even worse if Alice has set `git pull` to rebase by default. In this case, the commit `B` is rebased on top of `Q`. When Alice checks out `master` and merges in the branch, there will actually be a duplicate `B` commit. These new instructions instead tell the user to fetch Bob's `myfeature` branch. This will fetch the necessary commits `P` and `Q` and create a temporary ref `FETCH_HEAD` pointing to `Q`. Alice will then create her local `bob/repo-myfeature` branch starting at `FETCH_HEAD`. No unnecessary merge commits, and no accidental rebasing. See merge request !16
2014-10-16Add Markdown preview to more formsVinnie Okada
Enable Markdown previews when creating and editing issues, merge requests, and milestones, and when editing notes.
2014-10-15Show merge in progress message if MR is lockedDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-14Move "modify merge message link" to the right to prevent accidently hiting ↵Dmitriy Zaporozhets
accept button Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-07Style merge request CI widget to match MR/Issue boxDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-06Add task lists to issues and merge requestsVinnie Okada
Make the Markdown parser recognize "[x]" or "[ ]" at the beginning of a list item and turn it into a checkbox input. Users who can modify the issue or MR can toggle the checkboxes directly or edit the Markdown to manage the tasks. Task status is also displayed in the MR and issue lists.
2014-10-04Fix fa-download iconSullivan SENECHAL
2014-10-03Merge branch 'cirosantilli-factor-commit-msg-textarea'Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/projects/edit_tree/show.html.haml
2014-10-03Merge branch 'factor-commit-msg-textarea' of ↵Dmitriy Zaporozhets
https://github.com/cirosantilli/gitlabhq into cirosantilli-factor-commit-msg-textarea Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/projects/blob/_remove.html.haml
2014-10-03Upgrade to Font Awesome v4.2Sullivan SENECHAL
2014-10-03Merge pull request #7748 from yglukhov/clickable-source-repo-in-mrMarin Jankovski
Source repo is now clickable.
2014-10-02Factor commit message textareas.Ciro Santilli
2014-10-02Merge branch 'factor-issue-mr-form-label' of ↵Dmitriy Zaporozhets
https://github.com/cirosantilli/gitlabhq Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/projects/merge_requests/_form.html.haml
2014-10-02Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski
2014-10-01Search for 'div-dropzone' correctlyRobert Schilling
2014-09-30Simplify custom MR good commit message hint.Ciro Santilli
2014-09-22Remove ununsed CONTRIBUTING link on edit MR form.Ciro Santilli
The code is never reached because the new and edit MR forms have diverged, and the CONTRIBUTING link is not shown when editing MRs.
2014-09-22Factor issue and edit MR form label field and submit.Ciro Santilli
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 21:43:25 +0300