summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Dedupe labels in labels selector in Dashboard pagesfix/14418Rémy Coutable2016-03-183-23/+9
| | | | | Also moved useless helper methods and directly to the DashboardController.
* Merge branch 'no-gc-retry' into 'master' Robert Speicher2016-03-183-3/+13
|\ | | | | | | | | | | | | | | Do not retry "git gc" To prevent 'git gc' timing out on a large repo and then bouncing around in the retry queue. See merge request !3266
| * Fix HousekeepingService testsno-gc-retryJacob Vosmaer2016-03-181-2/+2
| |
| * Do not retry "git gc"Jacob Vosmaer2016-03-172-1/+11
| |
* | Merge branch 'fix/14388' into 'master' Douwe Maan2016-03-183-1/+27
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an issue when the target branch of a MR had been deleted Before displaying the "diverged commits" note, we're checking if the MR is open, but we should check if it's mergeable instead because this check ensure the source and target branches exist. This was introduced by !2217 and fixes #14388. See merge request !3294
| * | Add a safeguard in MergeRequest#compute_diverged_commits_countRémy Coutable2016-03-183-2/+27
| | | | | | | | | | | | | | | We have to ensure source_sha and target_sha are not nil before calling Gitlab::Git::Commit.between.
| * | Fix an issue when the target branch of a MR had been deletedRémy Coutable2016-03-182-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Before displaying the "diverged commits" note, we're checking if the MR is open, but we should check if it's mergeable instead because this check ensure the source and target branches exist. This was introduced by !2217 and fixes #14388.
* | | Merge branch 'refactor-ui-lists' into 'master' Dmitriy Zaporozhets2016-03-1814-76/+61
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor colors and lists * Introduce 2 color links: black and blue * Use black color link for UI elements like lists * Refactor lists to use .title nested under li * Make all lists (events, todos, activity, projects etc) use style * List colorschema is now 333 for links and 555 for text Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @jschatz1 @skyruler See merge request !3307
| * | Refactor colors and listsDmitriy Zaporozhets2016-03-1814-76/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Introduce 2 color links: black and blue * Use black color link for UI elements like lists * Refactor lists to use .title nested under li * Make all lists (events, todos, activity, projects etc) use style * List colorschema is now 333 for links and 555 for text Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'add_avatar_to_issue_mr_header' into 'master' Jacob Schatz2016-03-182-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add avatar to issue and MR pages header closes #14395 # For Issues ### Before ![Screen_Shot_2016-03-18_at_4.27.25_PM](/uploads/b097c8e304c9737e2f46ee25667829bf/Screen_Shot_2016-03-18_at_4.27.25_PM.png) ### After ![Screen_Shot_2016-03-18_at_4.22.10_PM](/uploads/f7d2b12c9455950c2e660b33e27c1827/Screen_Shot_2016-03-18_at_4.22.10_PM.png) # For Merge Request ### Before ![Screen_Shot_2016-03-18_at_4.27.09_PM](/uploads/50c7b6ee346f749f448647004ae6031b/Screen_Shot_2016-03-18_at_4.27.09_PM.png) ### After ![Screen_Shot_2016-03-18_at_4.24.17_PM](/uploads/abd37ccf030e0b6d10521a6937206de6/Screen_Shot_2016-03-18_at_4.24.17_PM.png) See merge request !3301
| * | | Add avatar to issue and MR pages headeradd_avatar_to_issue_mr_headerArinde Eniola2016-03-182-4/+4
| | | |
* | | | Merge branch 'refactor-variables' into 'master' Dmitriy Zaporozhets2016-03-184-33/+64
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Refactor variables Fixes #13803 and other color inconsistency across application cc @jschatz1 @skyruler See merge request !3304
| * | | Cleanup somce css colorsDmitriy Zaporozhets2016-03-184-20/+25
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Re-group scss variablesDmitriy Zaporozhets2016-03-181-21/+47
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'trigger-todo-for-mentions-on-commits-page' into 'master' Douwe Maan2016-03-1811-45/+187
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trigger a todo for mentions on commits page Closes #14006 * Screenshot: ![todo-commit](/uploads/5d34de0b7afcea7548123dafddf60c45/todo-commit.png) See merge request !3262
| * | | | Refactor `Todo#target`Douglas Barbosa Alexandre2016-03-182-12/+18
| | | | |
| * | | | Rename `Todo#to_reference` to `Todo#target_reference`Douglas Barbosa Alexandre2016-03-183-5/+5
| | | | | | | | | | | | | | | | | | | | Since we're not actually returning a todo reference.
| * | | | Update CHANGELOGtrigger-todo-for-mentions-on-commits-pageDouglas Barbosa Alexandre2016-03-181-0/+1
| | | | |
| * | | | Use `Note#for_project_snippet?` to skip notes on project snippetDouglas Barbosa Alexandre2016-03-181-1/+1
| | | | |
| * | | | Use `Commit#short_id` instead of `Commit.truncate_sha`Douglas Barbosa Alexandre2016-03-182-2/+4
| | | | |
| * | | | Reuse `for_commit?` on conditional validationsDouglas Barbosa Alexandre2016-03-181-2/+2
| | | | |
| * | | | Update schema info comment on todo related filesDouglas Barbosa Alexandre2016-03-183-6/+9
| | | | |
| * | | | Use todo.done without ! in the controller to mark todo as doneDouglas Barbosa Alexandre2016-03-183-6/+6
| | | | |
| * | | | Trigger a todo for mentions on commits pageDouglas Barbosa Alexandre2016-03-186-32/+149
| | | | |
| * | | | Add commit_id to todosDouglas Barbosa Alexandre2016-03-182-0/+8
| | | | |
| * | | | Change target_id to null on todosDouglas Barbosa Alexandre2016-03-182-1/+6
| | | | |
* | | | | Merge branch 'filter-label-missing' into 'master' Robert Speicher2016-03-186-9/+9
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Fixes issue with filter label missing on labels & milestones Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14407 See merge request !3297
| * | | | Fixes issue with filter label missing on labels & milestonesPhil Hughes2016-03-186-9/+9
| | |/ / | |/| |
* | | | Merge branch 'rs-issue-14259' into 'master' Robert Speicher2016-03-181-2/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Prevent a 500 when a repository's root_ref is nil Closes #14259 See merge request !3278
| * | | Prevent a 500 when a repository's root_ref is nilrs-issue-14259Robert Speicher2016-03-171-2/+4
| | | | | | | | | | | | | | | | Closes #14259
* | | | Merge branch 'dashboard-labels' into 'master' Robert Speicher2016-03-1812-94/+113
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dashboard labels Previously because there were no JSON endpoint for labels or milestones it was fetching HTML and parsing that. This is wrong. It now fetches from a JSON endpoint. This also fixes the dashboard/issues page not loading labels or milestones as the path used to be only for a single project. So instead I have created a endpoint for labels & milestones JSON on dashboard. See merge request !3253
| * | | | Fixed failing testsPhil Hughes2016-03-182-7/+6
| | | | |
| * | | | Updated controller with before_actionPhil Hughes2016-03-185-10/+8
| | | | | | | | | | | | | | | | | | | | Fixed other issues based on feedback
| * | | | Fixes issue on dashboard issuesPhil Hughes2016-03-187-67/+92
| | | | | | | | | | | | | | | | | | | | They would try to load JSON from a project even though it isn't a single project
| * | | | Full labels data in JSONPhil Hughes2016-03-181-1/+1
| | | | |
| * | | | Fixed issue with labels dropdown getting wrong labelsPhil Hughes2016-03-185-20/+17
|/ / / /
* | | | Merge branch 'fix-mr-close-button' into 'master' Jacob Schatz2016-03-182-2/+10
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Fixes issue with close button not working on MR Closes #14383 See merge request !3295
| * | | Added testPhil Hughes2016-03-181-0/+8
| | | |
| * | | Fixes issue with close button not working on MRfix-mr-close-buttonPhil Hughes2016-03-181-2/+2
| | | | | | | | | | | | | | | | Closes #14383
* | | | Merge branch 'improved-issue-sidebar' into 'master' Jacob Schatz2016-03-185-89/+145
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved issue sidebar Updated the spacing throughout the sidebar so that it fits better on smaller screens. Also adds a more participants button to show any other participants after the first row. Closes #13353 See merge request !3097
| * | | | Removed global JS varimproved-issue-sidebarPhil Hughes2016-03-182-6/+7
| | | | |
| * | | | Reused some variablesPhil Hughes2016-03-182-4/+7
| | | | | | | | | | | | | | | | | | | | Set global JS variable to sync view up
| * | | | Links to user on collapsed issue sidebarPhil Hughes2016-03-182-1/+5
| | | | |
| * | | | Fixed issue when user doesnt existPhil Hughes2016-03-182-11/+2
| | | | | | | | | | | | | | | | | | | | Fixed button hover color
| * | | | Fixed tooltip issue for participantsPhil Hughes2016-03-181-1/+1
| | | | |
| * | | | Improved issue sidebarPhil Hughes2016-03-185-88/+145
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Updated the spacing throughout the sidebar so that it fits better on smaller screens Added more participants button Closes #13353
* | | | Merge branch 'docs_select_version_to_install' into 'master' Achilleas Pipinellis2016-03-184-0/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note in upgrade guide to choose the correct version tag Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3448 @rspeicher I'm assigning to you since as a release manager you should know better. Let's keep it in this guide for now and then start copying it in the future ones. See merge request !2284
| * | | | Add note in rest of update guidesAchilleas Pipinellis2016-03-183-0/+27
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Merge branch 'master' into docs_select_version_to_installAchilleas Pipinellis2016-03-181704-17227/+72648
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'fix-mr-source-sha' into 'master' Douwe Maan2016-03-184-1/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MergeRequest#source_sha when there is no diff Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14170 ### Overview This MR fixes an unhandled Exception when visiting the page of an open Merge Request without diff. ### Description `MergeRequest#source_sha` is expected to return the sha of the source branch last commit. But when an open Merge Request has no diff (e.g. all commits have already been merged to the target branch), `merge_request.source_sha` incorrectly returns `nil`. This was without consequences before – but since !2217 was merged (a few days ago), it makes `Gitlab::Git::Commit.between` raise an "Unexpected nil argument" exception. This can be reproduced when visiting the http://localhost:3000/gitlab-org/gitlab-test/merge_requests/2 page on a fresh local Gitlab setup. This MR fixes the crash, by making sure that `source_sha` returns a correct result even when there is no diff available. I also added tests. @DouweM I believe you wrote most of this code in the first place ; does this looks correct to you, or is there a better way to resolve this issue maybe? See merge request !3135
View Lorry Controller Status