| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge request title is in the notification | Phil Hughes | 2016-03-18 | 1 | -1/+2 |
| | | | | | Short commit instead of long commit sha | ||||
| * | Commit SHA comes from JSON | Phil Hughes | 2016-03-18 | 1 | -1/+2 |
| | | | | | Removed page refresh - instead clicking takes to the builds tab | ||||
| * | Fix code style issues. | Jacob Schatz | 2016-03-18 | 1 | -3/+3 |
| | | |||||
| * | Removes name from file | Jacob Schatz | 2016-03-18 | 1 | -2/+2 |
| | | | | | Changes `:not_found` to `nil` | ||||
| * | Adds notifications API to MR page. | Jacob Schatz | 2016-03-18 | 1 | -15/+13 |
| | | | | | | When a build status changes a notification will popup. Fixes #10851 | ||||
| * | Adds JSON callback, which is currently not working. | Jacob Schatz | 2016-03-18 | 1 | -2/+9 |
| | | |||||
| * | initial ajax build | Jacob Schatz | 2016-03-18 | 1 | -1/+2 |
| | | |||||
| * | Move the #toggle_subscription controller method to a concern | Rémy Coutable | 2016-03-15 | 1 | -9/+3 |
| | | |||||
| * | Improving the original label-subscribing implementation | Rémy Coutable | 2016-03-15 | 1 | -0/+2 |
| | | | | | | | | 1. Make the "subscribed" text in Issuable sidebar reflect the labels subscription status 2. Current user mut be logged-in to toggle issue/MR/label subscription | ||||
| * | Use Gitlab::Git::DiffCollections | Jacob Vosmaer | 2016-03-03 | 1 | -1/+3 |
| | | |||||
| * | Rename Tasks to Todos | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -1/+1 |
| | | |||||
| * | Create or mark task pending as soon the action happens | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -0/+2 |
| | | |||||
| * | Label description and Label row | Tap | 2016-02-17 | 1 | -0/+2 |
| | | | | | | - Add label description - Show label row when filtering issues or merge requests by label | ||||
| * | Remember user's inline/tabular diff view preference in a cookie | kkm | 2016-02-05 | 1 | -0/+2 |
| | | |||||
| * | Save and use actual diff base commit for MR diff highlighting | Douwe Maan | 2016-01-20 | 1 | -2/+6 |
| | | |||||
| * | Fix autocomplete for new issues/MRs/snippetsfix-autocomplete-new-issues | Yorick Peterse | 2016-01-15 | 1 | -0/+1 |
| | | |||||
| * | Get "Merge when build succeeds" to work when commits were pushed to MR ↵ | Douwe Maan | 2016-01-05 | 1 | -1/+1 |
| | | | | | target branch while builds were running | ||||
| * | Merge branch 'fix-merge-immediately' into 'master' | Robert Speicher | 2015-12-16 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Fix 'Merge Immediately' button Fixes #4125 See merge request !2117 | ||||
| | * | Fix 'Merge Immediately' buttonfix-merge-immediately | Douwe Maan | 2015-12-16 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'fix-endpoint-not-setting-var' into 'master' | Douwe Maan | 2015-12-16 | 1 | -6/+3 |
| |\ \ | |/ |/| | | | | | | | | | Fix endpoint not setting needed @ci_commit /cc @DouweM See merge request !2112 | ||||
| | * | Fix endpoint not setting needed @ci_commit | Zeger-Jan van de Weg | 2015-12-16 | 1 | -6/+3 |
| | | | |||||
| * | | Merge branch 'ci-project-migrate' into 'master' | Kamil Trzciński | 2015-12-14 | 1 | -3/+0 |
| |\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci Project migrate - This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`. - This requires offline migrations. - It simplifies database models making all CI objects to be attached to: Project. - It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers). - We should add default `timeout` to Application Settings. - It misses specs. - It is based on ci-services-migrate for now. - It removes CI events. - It removes administrator CI projects overview. - It removes CI application settings. In 8.4 or 8.5 we can remove redundant tables and columns. See merge request !1987 | ||||
| | * | Fix errors | Kamil Trzcinski | 2015-12-11 | 1 | -3/+0 |
| | | | |||||
| * | | Implement new sidebar for merge request page | Dmitriy Zaporozhets | 2015-12-11 | 1 | -2/+0 |
| |/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Give merge request widget the vars it desires | Douwe Maan | 2015-12-09 | 1 | -0/+5 |
| | | |||||
| * | Merge branch 'master' into merge-if-green | Douwe Maan | 2015-12-09 | 1 | -12/+27 |
| |\ | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # config/routes.rb | ||||
| | * | Add Builds tab to MR detail page | Douwe Maan | 2015-12-08 | 1 | -12/+29 |
| | | | |||||
| * | | Merge branch 'master' into merge-if-green | Douwe Maan | 2015-12-08 | 1 | -0/+2 |
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/merge_requests/widget/_heading.html.haml # app/views/projects/merge_requests/widget/open/_accept.html.haml | ||||
| | * | | Get ci_commit in MR controller | Douwe Maan | 2015-12-08 | 1 | -0/+2 |
| | |/ | |||||
| * | | Merge branch 'master' into merge-if-green | Zeger-Jan van de Weg | 2015-12-07 | 1 | -4/+2 |
| |\ \ | |/ | |||||
| | * | Strip attributes for Milestone and Issuable. #3428 | Jose Corcuera | 2015-11-26 | 1 | -3/+1 |
| | | | |||||
| | * | award for merge requests[ci skip] | Valery Sizov | 2015-11-19 | 1 | -1/+1 |
| | | | |||||
| | * | award emoji | Valery Sizov | 2015-11-19 | 1 | -1/+1 |
| | | | |||||
| * | | Refactor MergeWhenBuildSucceedsService and incorporate feedback | Zeger-Jan van de Weg | 2015-11-23 | 1 | -8/+3 |
| | | | |||||
| * | | Merge branch 'master' into merge-if-green | Zeger-Jan van de Weg | 2015-11-18 | 1 | -1/+4 |
| |\ \ | |/ | |||||
| | * | Fix trailing space issue with merge requests and issues. Fixes #2514 | Drew Blessing | 2015-11-10 | 1 | -1/+3 |
| | | | |||||
| | * | Display target branch on MR list when it is different from project's default | Anton Baklanov | 2015-11-10 | 1 | -0/+1 |
| | | | |||||
| * | | API support, incorporated feedback | Zeger-Jan van de Weg | 2015-11-18 | 1 | -3/+1 |
| | | | |||||
| * | | MRs author can cancel automatic merge | Zeger-Jan van de Weg | 2015-11-02 | 1 | -1/+3 |
| | | | |||||
| * | | Merge when build succeeds | Zeger-Jan van de Weg | 2015-11-02 | 1 | -6/+29 |
| |/ | |||||
| * | Correctly find last known blob for file deleted in MR.merge-request-deleted-file | Douwe Maan | 2015-10-20 | 1 | -1/+4 |
| | | |||||
| * | Show merge requests which close current issue | Zeger-Jan van de Weg | 2015-10-16 | 1 | -1/+1 |
| | | |||||
| * | Simplify code around (cross)-references | Douwe Maan | 2015-10-12 | 1 | -1/+1 |
| | | |||||
| * | Improve error message when merging failsmr_improve_errors_handling | Valery Sizov | 2015-10-01 | 1 | -0/+1 |
| | | |||||
| * | Fix error when MR source branch no longer exists.fix-mr-missing-source-branch-error | Douwe Maan | 2015-09-22 | 1 | -2/+1 |
| | | |||||
| * | Fetch merge request ref if it is missing when visit MR pagefix-mr-without-refs | Dmitriy Zaporozhets | 2015-09-21 | 1 | -0/+7 |
| | | | | | | | | This will fix merge problem for merge requests between forks created before 8.0 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Revert "Merge branch 'revert-satellites' into 'master' " | Dmitriy Zaporozhets | 2015-08-11 | 1 | -7/+5 |
| | | | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c. | ||||
| * | Revert "Merge branch 'drop-satellites'" | Dmitriy Zaporozhets | 2015-08-11 | 1 | -5/+7 |
| | | | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Huge refactoring for accepting merge requests | Dmitriy Zaporozhets | 2015-07-16 | 1 | -5/+5 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Refactor compare and fetch logic | Dmitriy Zaporozhets | 2015-07-15 | 1 | -2/+1 |
| | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |